summaryrefslogtreecommitdiffstats
path: root/bin/prepare_minion.py
diff options
context:
space:
mode:
Diffstat (limited to 'bin/prepare_minion.py')
-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: