Skip to content
Snippets Groups Projects
Commit 8ebb7f57 authored by Brian Jackson's avatar Brian Jackson
Browse files

Stop using clean: True on /etc/salt/{minion,master}.d

New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
parent 2118cc09
No related branches found
No related tags found
No related merge requests found
salt:
clean_config_d_dir: False
# to overwrite map.jinja salt packages
lookup:
......
......@@ -10,3 +10,4 @@ salt:
salt_cloud: salt-cloud
salt_api: salt-api
salt_ssh: salt-ssh
clean_config_d_dir: False
......@@ -7,7 +7,7 @@ salt-master:
- name: {{ salt_settings.config_path }}/master.d
- template: jinja
- source: salt://salt/files/master.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
service.running:
- enable: True
- name: {{ salt_settings.master_service }}
......
......@@ -7,7 +7,7 @@ salt-minion:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
- context:
standalone: False
service.running:
......
......@@ -7,7 +7,7 @@ salt-minion:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
- context:
standalone: True
service.dead:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment