summaryrefslogtreecommitdiffstats
path: root/pillar/role
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-24 21:59:04 +0100
committerGeorg Pfuetzenreuter2023-01-24 21:59:04 +0100
commit342affc1b8d8a3c6152de27e809a63e6cc86b043 (patch)
treec2fe8ba6fd06a751d1cb473146b6424691ee5003 /pillar/role
parentd83eb08f484219acbc375389d42e57b3da440ed9 (diff)
parent4c6b221dad25904be415aea21a743bc7c24e1453 (diff)
downloadsalt-342affc1b8d8a3c6152de27e809a63e6cc86b043.tar.gz
salt-342affc1b8d8a3c6152de27e809a63e6cc86b043.tar.bz2
salt-342affc1b8d8a3c6152de27e809a63e6cc86b043.zip
Merge pull request 'Include role.salt.common in master' (#3) from master-include-common into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/3
Diffstat (limited to 'pillar/role')
-rw-r--r--pillar/role/salt/master.sls3
1 files changed, 3 insertions, 0 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index cafd05d..49785ac 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -1,5 +1,8 @@
{%- set formulas = ['salt', 'users', 'postfix'] -%}
+include:
+ - role.salt.common
+
salt:
interface: ${'secret_salt:master:interface'}
master_remove_config: True