Fix configuration file resources creation
There is some duplicating configuration file resources definitions leading
to resource conflicts.
Add condition to define resource once.
Change-Id: Ib70081eea2a8c1bde76beb54cfcf21b8bb5d74b2
See: https://mirantis.jira.com/browse/PROD-21386
diff --git a/jenkins/master/service.sls b/jenkins/master/service.sls
index c3e717b..635ba17 100644
--- a/jenkins/master/service.sls
+++ b/jenkins/master/service.sls
@@ -19,6 +19,7 @@
- pkg: jenkins_packages
{%- if master.get('no_config', False) == False %}
+
{{ master.home }}/config.xml:
file.managed:
- source: salt://jenkins/files/config.xml
@@ -26,7 +27,6 @@
- user: jenkins
- watch_in:
- service: jenkins_master_service
-{%- endif %}
{%- if master.update_site_url is defined %}
@@ -64,6 +64,8 @@
{%- endif %}
+{%- 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 ae730c6..f111ae3 100644
--- a/jenkins/meta/config.yml
+++ b/jenkins/meta/config.yml
@@ -3,11 +3,11 @@
{%- from "jenkins/map.jinja" import master with context %}
{%- if master.get('no_config', True) == False %}
+
config.xml:
path: {{ master.home }}/config.xml
source: "salt://jenkins/files/config.xml"
template: jinja
- {%- endif %}
{%- if master.update_site_url is defined %}
hudson.model.UpdateCenter.xml:
@@ -41,6 +41,8 @@
{%- endif %}
+ {%- endif %}
+
{#-
vim: syntax=jinja