updated saltmaster configuration

states/roles/maintain/saltmaster/init.sls

@@ -1,3 +1,4 @@
+{%- set os=grains['os'] -%}
 salt-master:
 {%- if os=="CentOS" or os=="RedHat" %}
   pkg.installed: []
@@ -17,6 +18,7 @@ salt-master:
     - user: root
     - group: root
     - mode: 644
+    - template: jinja
 
 /srv/salt/prod/states/pillars:
   file.symlink:

states/roles/maintain/saltmaster/master

@@ -422,12 +422,14 @@ state_output: terse
 #     - /srv/salt/prod/states
 #
 file_roots:
-  base:
+{%- if pillar['branches'] is defined -%}
-    - /srv/salt/prod/states
+{%- if pillar['branches']['saltmaster'] is defined -%}
-  prod:
+{%- for branch in pillar['branches']['saltmaster'] %}
-    - /srv/salt/prod/states
+  {{branch}}:
-  dev:
+    - /srv/salt/{{branch}}/states
-    - /srv/salt/dev/states
+{%- endfor %}
+{%- endif %}
+{%- endif %}
 #
 
 # When using multiple environments, each with their own top file, the
@@ -439,7 +441,7 @@ file_roots:
 # To specify the order in which environments are merged, set the ordering
 # in the env_order option. Given a conflict, the last matching value will
 # win.
-env_order: ['base', 'dev', 'prod']
+env_order: ['qual', 'prod']
 
 # If top_file_merging_strategy is set to 'same' and an environment does not
 # contain a top file, the top file in the environment specified by default_top
@@ -560,12 +562,14 @@ hash_type: sha256
 #    - /srv/pillar
 #
 pillar_roots:
-  base:
+{%- if pillar['branches'] is defined -%}
-    - /srv/salt/prod/pillars
+{%- if pillar['branches']['saltmaster'] is defined -%}
-  prod:
+{%- for branch in pillar['branches']['saltmaster'] %}
-    - /srv/salt/prod/pillars
+  {{branch}}:
-  dev:
+    - /srv/salt/{{branch}}/pillars
-    - /srv/salt/dev/pillars
+{%- endfor %}
+{%- endif %}
+{%- endif %}
 #
 #ext_pillar:
 #  - hiera: /etc/hiera.yaml