diff options
| -rw-r--r-- | pillar/common.sls | 2 | ||||
| -rw-r--r-- | pillar/role/salt/common.sls | 2 | ||||
| -rw-r--r-- | pillar/role/salt/minion.sls | 5 | ||||
| -rw-r--r-- | salt/common/init.sls | 2 | ||||
| -rw-r--r-- | salt/role/salt/minion.sls (renamed from salt/role/minion.sls) | 1 |
5 files changed, 11 insertions, 1 deletions
diff --git a/pillar/common.sls b/pillar/common.sls index fc62816..de375e2 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -1,4 +1,6 @@ include: + - role.salt.common + - role.salt.minion - secret.common managed_header_pound: | diff --git a/pillar/role/salt/common.sls b/pillar/role/salt/common.sls new file mode 100644 index 0000000..eb86127 --- /dev/null +++ b/pillar/role/salt/common.sls @@ -0,0 +1,2 @@ +salt: + hash_type: sha512 diff --git a/pillar/role/salt/minion.sls b/pillar/role/salt/minion.sls new file mode 100644 index 0000000..f67ec63 --- /dev/null +++ b/pillar/role/salt/minion.sls @@ -0,0 +1,5 @@ +salt: + minion_remove_config: True + minion: + master_type: str + master: {{ pillar['netbox']['config_context']['salt_master'] }} diff --git a/salt/common/init.sls b/salt/common/init.sls index 7fbb4f4..52ac5a5 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -1,3 +1,3 @@ include: - - role.minion + - role.salt.minion - common.{{ grains['os'] | lower }} diff --git a/salt/role/minion.sls b/salt/role/salt/minion.sls index 1da5da3..dceff40 100644 --- a/salt/role/minion.sls +++ b/salt/role/salt/minion.sls @@ -1,2 +1,3 @@ include: - profile.salt.grains + - salt.minion |