diff options
Diffstat (limited to 'salt/profile/salt')
| -rw-r--r-- | salt/profile/salt/master.sls | 8 | ||||
| -rw-r--r-- | salt/profile/salt/minion.sls | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls index a8dce54..f0fdc7c 100644 --- a/salt/profile/salt/master.sls +++ b/salt/profile/salt/master.sls @@ -17,7 +17,7 @@ salt_master_extension_modules_dirs: {%- endfor %} - user: root - group: salt - - mode: 0755 + - mode: '0755' salt_master_extension_modules_bins: file.managed: @@ -30,7 +30,7 @@ salt_master_extension_modules_bins: {%- endfor %} - user: root - group: salt - - mode: 0640 + - mode: '0640' - require: - file: salt_master_extension_modules_dirs @@ -72,7 +72,7 @@ salt_master_extra_packages: - requirepass {{ master_pillar['cache.redis.password'] }} - user: root - group: redis - - mode: 0640 + - mode: '0640' - require: - pkg: redis @@ -80,7 +80,7 @@ salt_master_extra_packages: file.directory: - user: redis - group: redis - - mode: 0750 + - mode: '0750' - require: - pkg: redis diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls index 5d33845..7d2ad54 100644 --- a/salt/profile/salt/minion.sls +++ b/salt/profile/salt/minion.sls @@ -1,5 +1,7 @@ {%- set netbox_pillar = salt['pillar.get']('netbox') -%} -{%- if 'custom_fields' in netbox_pillar and netbox_pillar['custom_fields']['salt_roles'] is not none and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%} +{%- if 'custom_fields' in netbox_pillar + and netbox_pillar['custom_fields']['salt_roles'] is not none + and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%} {%- set master = salt['pillar.get']('salt:master:syndic_master') -%} {%- elif 'config_context' in netbox_pillar -%} {%- set master = netbox_pillar['config_context']['salt_master'] -%} |