Fixed diffing in jenkins_job state, cleanups.
diff --git a/_states/jenkins_job.py b/_states/jenkins_job.py
index e28bed8..0213f4e 100644
--- a/_states/jenkins_job.py
+++ b/_states/jenkins_job.py
@@ -59,7 +59,8 @@
newXML = ET.fromstring(_fp.read())
if not _elements_equal(oldXML, newXML):
diff = difflib.unified_diff(
- oldXML.tostring(), newXML.tostring(), lineterm='')
+ ET.tostringlist(oldXML, encoding='utf8', method='xml'),
+ ET.tostringlist(newXML, encoding='utf8', method='xml'), lineterm='')
__salt__['jenkins.update_job'](name, config, __env__)
ret['changes'] = ''.join(diff)
ret['comment'].append('Job {0} updated.'.format(name))
diff --git a/jenkins/master/service.sls b/jenkins/master/service.sls
index ff9798f..8dcd8d7 100644
--- a/jenkins/master/service.sls
+++ b/jenkins/master/service.sls
@@ -66,10 +66,6 @@
{%- endif %}
-{%- if master.credentials is defined %}
-
-{%- endif %}
-
{%- if master.get('sudo', false) %}
/etc/sudoers.d/99-jenkins-user:
diff --git a/jenkins/meta/config.yml b/jenkins/meta/config.yml
index d54cf0b..ae730c6 100644
--- a/jenkins/meta/config.yml
+++ b/jenkins/meta/config.yml
@@ -30,13 +30,6 @@
template: jinja
{%- endif %}
- {%- if master.credentials is defined %}
- credentials.xml:
- path: {{ master.home }}/credentials.xml
- source: "salt://jenkins/files/credentials.xml"
- template: jinja
- {%- endif %}
-
{%- for user_name, user in master.get('user', {}).iteritems() %}
{{ user_name }}_config.yml:
path: {{ master.home }}/users/{{ user_name }}/config.xml