Remove hardcoded paths with {{ slspath }} variable

This commit is contained in:
Niels Abspoel
2015-06-09 23:05:49 +02:00
parent 62a13de7d5
commit 6ec31374cb
6 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -37,7 +37,7 @@ salt-cloud:
cloud-cert-{{ cert }}-pem:
file.managed:
- name: /etc/salt/pki/cloud/{{ cert }}.pem
- source: salt://salt/files/key
- source: salt://{{ slspath }}/files/key
- template: jinja
- user: root
- group: root
+1 -1
View File
@@ -8,7 +8,7 @@ salt-master:
file.recurse:
- name: {{ salt_settings.config_path }}/master.d
- template: jinja
- source: salt://salt/files/master.d
- source: salt://{{ slspath }}/files/master.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
service.running:
+1 -1
View File
@@ -8,7 +8,7 @@ salt-minion:
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- source: salt://{{ slspath }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- context:
+2 -2
View File
@@ -1,7 +1,7 @@
saltstack-apt-key:
file.managed:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg
- source: salt://salt/pkgrepo/debian/saltstack.gpg
- source: salt://{{ slspath }}/saltstack.gpg
- user: root
- group: root
- mode: 644
@@ -9,7 +9,7 @@ saltstack-apt-key:
saltstack-pkgrepo:
file.managed:
- name: /etc/apt/sources.list.d/saltstack.list
- source: salt://salt/pkgrepo/debian/sources.list
- source: salt://{{ slspath }}/sources.list
- user: root
- group: root
- mode: 644
+1 -1
View File
@@ -9,7 +9,7 @@ ensure-salt-ssh-is-installed:
ensure-roster-config:
file.managed:
- name: {{ salt_settings.config_path }}/roster
- source: salt://salt/files/roster.jinja
- source: salt://{{ slspath }}/files/roster.jinja
- template: jinja
{% if salt_settings.install_packages %}
- require:
+1 -1
View File
@@ -8,7 +8,7 @@ salt-minion:
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- source: salt://{{ slspath }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- context: