From 11620c863cafff26152d8cdca49c369a5d69474f Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 15 Jan 2023 15:50:17 +0100 Subject: Init salted salt + minion pillar Signed-off-by: Georg Pfuetzenreuter --- pillar/common.sls | 2 ++ pillar/role/salt/common.sls | 2 ++ pillar/role/salt/minion.sls | 5 +++++ salt/common/init.sls | 2 +- salt/role/minion.sls | 2 -- salt/role/salt/minion.sls | 3 +++ 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 pillar/role/salt/common.sls create mode 100644 pillar/role/salt/minion.sls delete mode 100644 salt/role/minion.sls create mode 100644 salt/role/salt/minion.sls 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/minion.sls deleted file mode 100644 index 1da5da3..0000000 --- a/salt/role/minion.sls +++ /dev/null @@ -1,2 +0,0 @@ -include: - - profile.salt.grains diff --git a/salt/role/salt/minion.sls b/salt/role/salt/minion.sls new file mode 100644 index 0000000..dceff40 --- /dev/null +++ b/salt/role/salt/minion.sls @@ -0,0 +1,3 @@ +include: + - profile.salt.grains + - salt.minion -- cgit v1.2.3