Browse Source

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
master
Brian Jackson 9 years ago
parent
commit
8ebb7f57df
5 changed files with 8 additions and 6 deletions
  1. +4
    -3
      pillar.example
  2. +1
    -0
      salt/defaults.yaml
  3. +1
    -1
      salt/master.sls
  4. +1
    -1
      salt/minion.sls
  5. +1
    -1
      salt/standalone.sls

+ 4
- 3
pillar.example View File

salt: salt:
clean_config_d_dir: False


# to overwrite map.jinja salt packages # to overwrite map.jinja salt packages
lookup: lookup:
ssl_key: /etc/pki/api/certs/server.key ssl_key: /etc/pki/api/certs/server.key
debug: False debug: False
disable_ssl: False disable_ssl: False
# salt minion config: # salt minion config:
minion: minion:


# single master setup # single master setup
master: salt master: salt
# multi master setup # multi master setup
master: master:
- salt_master_1 - salt_master_1
- salt_master_2 - salt_master_2
fileserver_backend: fileserver_backend:
- git - git
- roots - roots

+ 1
- 0
salt/defaults.yaml View File

salt_cloud: salt-cloud salt_cloud: salt-cloud
salt_api: salt-api salt_api: salt-api
salt_ssh: salt-ssh salt_ssh: salt-ssh
clean_config_d_dir: False

+ 1
- 1
salt/master.sls View File

- name: {{ salt_settings.config_path }}/master.d - name: {{ salt_settings.config_path }}/master.d
- template: jinja - template: jinja
- source: salt://salt/files/master.d - source: salt://salt/files/master.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
service.running: service.running:
- enable: True - enable: True
- name: {{ salt_settings.master_service }} - name: {{ salt_settings.master_service }}

+ 1
- 1
salt/minion.sls View File

- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
- template: jinja - template: jinja
- source: salt://salt/files/minion.d - source: salt://salt/files/minion.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
- context: - context:
standalone: False standalone: False
service.running: service.running:

+ 1
- 1
salt/standalone.sls View File

- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
- template: jinja - template: jinja
- source: salt://salt/files/minion.d - source: salt://salt/files/minion.d
- clean: True
- clean: {{ salt_settings.clean_config_d_dir }}
- context: - context:
standalone: True standalone: True
service.dead: service.dead:

Loading…
Cancel
Save