summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-22 14:30:39 +0100
committerGeorg Pfuetzenreuter2023-01-22 14:34:42 +0100
commitd593cbeae56ee805bdd33821e6c10f85b0e58fa1 (patch)
tree9ee1a6d3ce5d809df773a6e343dd2f599cac26f2
parent928809b267a4e6a26006aa56354c32cdd629a98e (diff)
downloadsalt-d593cbeae56ee805bdd33821e6c10f85b0e58fa1.tar.gz
salt-d593cbeae56ee805bdd33821e6c10f85b0e58fa1.tar.bz2
salt-d593cbeae56ee805bdd33821e6c10f85b0e58fa1.zip
salt.master: move gpg_keydir to master
'gpg_keydir' is a master specific setting, it does not work under the top level 'salt' key. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r--pillar/role/salt/master.sls2
1 files changed, 1 insertions, 1 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index 1608a3e..171491d 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -1,5 +1,4 @@
salt:
- gpg_keydir: ${'secret_salt:master:gpg_keydir'}
interface: ${'secret_salt:master:interface'}
master_remove_config: True
extmods: {'modules': ['nbroles.py'], 'pillar': ['lookup.py']}
@@ -8,6 +7,7 @@ salt:
cli_summary: True
# to-do: package extension modules
extension_modules: /opt/extmods
+ gpg_keydir: ${'secret_salt:master:gpg_keydir'}
ipv6: True
file_ignore_glob:
- '*.pyc'