Merge pull request 'Allow saltenv/pillarenv override' (#45) from saltenv into production

Reviewed-on: #45

pillar/role/salt/master.sls

@@ -21,7 +21,7 @@ salt:
       - roots
       - git
     file_roots:
-      production:
+      __env__:
         {%- for formula in formulas %}
         - /srv/formulas/{{ formula }}-formula
         {%- endfor %}
@@ -30,6 +30,7 @@ salt:
       - https://git.com.de/LibertaCasa/salt.git:
         - user: ${'secret_salt:master:gitfs_remotes:LibertaCasa:user'}
         - password: ${'secret_salt:master:gitfs_remotes:LibertaCasa:password'}
+        - fallback: production
     ext_pillar:
       - netbox:
           api_url: ${'secret_salt:master:ext_pillar:netbox:api_url'}
@@ -53,7 +54,6 @@ 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