summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-05-01 20:20:32 +0200
committerGeorg Pfuetzenreuter2023-05-01 20:20:32 +0200
commit10891468015f0654ce63d6e5efe9a49a5d8521a0 (patch)
tree6165da28196917dc4174631b650656ba945334ab
parent27d178d852c9e07ed58751a38bc42b1153821bfd (diff)
downloadsalt-10891468015f0654ce63d6e5efe9a49a5d8521a0.tar.gz
salt-10891468015f0654ce63d6e5efe9a49a5d8521a0.tar.bz2
salt-10891468015f0654ce63d6e5efe9a49a5d8521a0.zip
Set env_order
Option was removed in d4f39e8e5f807169b790d5380c10872d1ba31710, but the default environment seems to not be set to "production" without it being present. Adding it back until a better way is found. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r--pillar/role/salt/master.sls1
1 files changed, 1 insertions, 0 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index b1a0f2e..77aa44f 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -54,6 +54,7 @@ salt:
pillar_merge_lists: True
pillar_source_merging_strategy: smart
top_file_merging_strategy: same
+ env_order: ['production']
log_level: info
show_jid: True
timeout: 20