Revert "Add internal dependencies in state jenkins.client"
This reverts commit d0dc010b2de2d4474e17e86128f2662e0c582774.
Change-Id: I93f4054432a5e3a815faff9d178f29f462ddc5c8
diff --git a/jenkins/client/_job.sls b/jenkins/client/_job.sls
index afb64da..1a8e6df 100644
--- a/jenkins/client/_job.sls
+++ b/jenkins/client/_job.sls
@@ -20,20 +20,6 @@
- config: {{ client.dir.jenkins_jobs_root }}/{{ job_name }}.xml
- watch:
- file: jenkins_job_{{ job_name }}_definition
- - require:
- - sls: jenkins.client.approval
- - sls: jenkins.client.artifactory
- - sls: jenkins.client.credential
- - sls: jenkins.client.gerrit
- - sls: jenkins.client.globalenvprop
- - sls: jenkins.client.jira
- - sls: jenkins.client.lib
- - sls: jenkins.client.node
- - sls: jenkins.client.plugin
- - sls: jenkins.client.security
- - sls: jenkins.client.slack
- - sls: jenkins.client.smtp
- - sls: jenkins.client.throttle_category
{%- else %}
diff --git a/jenkins/client/approval.sls b/jenkins/client/approval.sls
index e603444..6969807 100644
--- a/jenkins/client/approval.sls
+++ b/jenkins/client/approval.sls
@@ -3,6 +3,4 @@
approve_jenkins_signature_{{ approval }}:
jenkins_approval.approved:
- name: {{ approval }}
- - require:
- - sls: jenkins.client.plugin
-{% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/jenkins/client/artifactory.sls b/jenkins/client/artifactory.sls
index 64d5645..7f06e20 100644
--- a/jenkins/client/artifactory.sls
+++ b/jenkins/client/artifactory.sls
@@ -6,12 +6,9 @@
- name: {{ artifactory.get('name', name) }}
- url: {{ artifactory.get('url', '') }}
- credential_id: {{ artifactory.get('credential_id', '') }}
- - require:
- - sls: jenkins.client.plugin
- - jenkins_credential: {{ artifactory.get('credential_id', '') }}
{% else %}
jenkins_artifactory_server_{{ name }}_disable:
jenkins_artifactory.absent:
- name: {{ artifactory.get('name', name) }}
{% endif %}
-{% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/jenkins/client/credential.sls b/jenkins/client/credential.sls
index d4e47c1..1f2247f 100644
--- a/jenkins/client/credential.sls
+++ b/jenkins/client/credential.sls
@@ -12,6 +12,4 @@
- key: |
{{ cred.get('key','')|indent(6) }}
{%- endif %}
- - require:
- - sls: jenkins.client.plugin
{% endfor %}
diff --git a/jenkins/client/gerrit.sls b/jenkins/client/gerrit.sls
index b398584..24c4abf 100644
--- a/jenkins/client/gerrit.sls
+++ b/jenkins/client/gerrit.sls
@@ -20,7 +20,5 @@
{{ gerrit.get('authkey','')|indent(6) }}
{%- endif %}
- auth_key_file_password: {{ gerrit.get('auth_key_file_password', '') }}
- - require:
- - sls: jenkins.client.plugin
{% endfor %}
{%- endif %}
diff --git a/jenkins/client/jira.sls b/jenkins/client/jira.sls
index ec8a31a..39d7105 100644
--- a/jenkins/client/jira.sls
+++ b/jenkins/client/jira.sls
@@ -22,8 +22,6 @@
},
{% endfor %}
}
- - require:
- - sls: jenkins.client.plugin
{% else %}
jenkins_jira_disable:
jenkins_jira.absent
diff --git a/jenkins/client/lib.sls b/jenkins/client/lib.sls
index df0a8e3..fd27d28 100644
--- a/jenkins/client/lib.sls
+++ b/jenkins/client/lib.sls
@@ -7,8 +7,6 @@
- url: {{ lib.url }}
{%- if lib.credential_id is defined %}
- credential_id: {{ lib.credential_id }}
- - require:
- - jenkins_credential: {{ lib.credential_id }}
{%- endif %}
- branch: {{ lib.get("branch", "master") }}
{%- else %}
@@ -16,4 +14,4 @@
jenkins_lib.absent:
- name: {{ lib.get('name', name) }}
{%- endif %}
-{% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/jenkins/client/security.sls b/jenkins/client/security.sls
index eb34669..4b9cc41 100644
--- a/jenkins/client/security.sls
+++ b/jenkins/client/security.sls
@@ -10,8 +10,6 @@
- user_search: {{ client.security.ldap.get('user_search','') }}
- group_search_base: {{ client.security.ldap.get('group_search_base', '') }}
- inhibit_infer_root_dn: {{ client.security.ldap.get('inhibit_infer_root_dn', False) }}
- - require:
- - sls: jenkins.client.plugin
{%- endif %}
{%- if client.security.matrix is defined %}
@@ -19,8 +17,6 @@
jenkins_security.matrix:
- strategies: {{ client.security.matrix.permissions }}
- project_based: {{ client.security.matrix.get('project_based', False) }}
- - require:
- - sls: jenkins.client.plugin
{%- endif %}
{%- if client.security.csrf is defined %}
diff --git a/jenkins/client/slack.sls b/jenkins/client/slack.sls
index e1f33db..ed71773 100644
--- a/jenkins/client/slack.sls
+++ b/jenkins/client/slack.sls
@@ -7,7 +7,4 @@
- token_credential_id: {{ client.slack.get('token_credential_id','') }}
- send_as: {{ client.slack.get('send_as','') }}
- room: {{ client.slack.get('room', '') }}
- - require:
- - sls: jenkins.client.plugin
- - sls: jenkins.client.credential
{%- endif %}
diff --git a/jenkins/client/smtp.sls b/jenkins/client/smtp.sls
index d322d38..ae378eb 100644
--- a/jenkins/client/smtp.sls
+++ b/jenkins/client/smtp.sls
@@ -9,8 +9,6 @@
- port: {{ client.smtp.get('port', '') }}
- ssl: {{ client.smtp.get('ssl', '') }}
- charset: {{ client.smtp.get('charset', '') }}
- - require:
- - sls: jenkins.client.plugin
{%- endif %}
{%- if client.smtp is defined and client.smtp.admin_email is defined %}
diff --git a/jenkins/client/theme.sls b/jenkins/client/theme.sls
index 6e68f1c..7707add 100644
--- a/jenkins/client/theme.sls
+++ b/jenkins/client/theme.sls
@@ -4,6 +4,4 @@
jenkins_theme.config:
- css_url: {{ client.theme.css_url }}
- js_url: {{ client.theme.js_url }}
- - require:
- - sls: jenkins.client.plugin
{%- endif %}
diff --git a/jenkins/client/throttle_category.sls b/jenkins/client/throttle_category.sls
index 78a8da5..de508a0 100644
--- a/jenkins/client/throttle_category.sls
+++ b/jenkins/client/throttle_category.sls
@@ -9,7 +9,6 @@
- labels: {{ throttle_category.get('max_per_label',[]) }}
- require:
- jenkins_client_install
- - sls: jenkins.client.plugin
{% else %}
'throttle_category_{{ name }}_disable':
jenkins_throttle_category.absent:
diff --git a/jenkins/client/view.sls b/jenkins/client/view.sls
index c47555d..7ac0b07 100644
--- a/jenkins/client/view.sls
+++ b/jenkins/client/view.sls
@@ -9,12 +9,9 @@
- {{ key }}: {{ value }}
{%- endif %}
{%- endfor %}
- - require:
- - sls: jenkins.client.job
- - sls: jenkins.client.plugin
{% else %}
view_{{ name }}_disable:
jenkins_view.absent:
- name: {{ view.get('name', name) }}
{% endif %}
-{% endfor %}
+{% endfor %}
\ No newline at end of file