summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-29 15:29:30 +0100
committerGeorg Pfuetzenreuter2023-01-29 15:29:30 +0100
commit1660fb099e26a9a2365b8fc12e3926720f989153 (patch)
tree2a9ad4e26fbba1cd08efce101797bfa0967691a1
parent4ece021122a97dab684ae8ffdd31d0edfe80c47f (diff)
downloadsalt-1660fb099e26a9a2365b8fc12e3926720f989153.tar.gz
salt-1660fb099e26a9a2365b8fc12e3926720f989153.tar.bz2
salt-1660fb099e26a9a2365b8fc12e3926720f989153.zip
Merge lists on test minions
Reflect production setting, allow pillar to merge from different roles. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rwxr-xr-xbin/prepare_minion.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/prepare_minion.py b/bin/prepare_minion.py
index 92d45c5..2b0ac0f 100755
--- a/bin/prepare_minion.py
+++ b/bin/prepare_minion.py
@@ -15,7 +15,7 @@ mypwd = os.getcwd()
formulasfile = 'formulas.yaml'
formulasdir = '/srv/formulas'
-configdata = {'file_roots': {'production': ['/srv/salt']}}
+configdata = {'file_roots': {'production': ['/srv/salt']}, 'pillar_merge_lists': True}
grainsdata = {'roles': roles}
with open(grainsfile, mode='w') as grainsfh: