pillars/top.sls

@@ -1,6 +1,6 @@
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
-{%- for env in envs %}
+{%- for branch in branches %}
-{{env}}:
+{{branch}}:
   '*':
     - roles
     - servers

squash.sh

@@ -7,7 +7,7 @@ git reset --hard qual;
 git push --force;
 
 #merge to master
-git checkout -B prod origin/prod;
+git checkout -B prod origin/master;
 git merge --squash qual;
 git commit -am "$cm";
 git push;

states/roles/maintain/saltmaster/master

@@ -1,4 +1,3 @@
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
 ##### Primary configuration settings #####
 ##########################################
 # This configuration file is used to manage the behavior of the Salt Master.
@@ -423,10 +422,14 @@ state_output: terse
 #     - /srv/salt/prod/states
 #
 file_roots:
-{%- for env in envs %}
+{%- if pillar['branches'] is defined -%}
-  {{env}}:
+{%- if pillar['branches']['saltmaster'] is defined -%}
-    - /srv/salt/{{env}}/states
+{%- for branch in pillar['branches']['saltmaster'] %}
+  {{branch}}:
+    - /srv/salt/{{branch}}/states
 {%- endfor %}
+{%- endif %}
+{%- endif %}
 #
 
 # When using multiple environments, each with their own top file, the
@@ -438,11 +441,15 @@ 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.
+{% if pillar['branches'] is defined -%}
+{%- if pillar['branches']['saltmaster'] is defined -%}
 env_order: [
-{%- for env in envs -%}
+{%- for branch in pillar['branches']['saltmaster'] -%}
-  '{{env}}',
+  '{{-branch}}',
 {%- endfor -%}
 'null']
+{%- endif %}
+{%- endif %}
 
 # 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
@@ -563,10 +570,14 @@ hash_type: sha256
 #    - /srv/pillar
 #
 pillar_roots:
-{%- for env in envs %}
+{%- if pillar['branches'] is defined -%}
-  {{env}}:
+{%- if pillar['branches']['saltmaster'] is defined -%}
-    - /srv/salt/{{env}}/pillars
+{%- for branch in pillar['branches']['saltmaster'] %}
+  {{branch}}:
+    - /srv/salt/{{branch}}/pillars
 {%- endfor %}
+{%- endif %}
+{%- endif %}
 #
 #ext_pillar:
 #  - hiera: /etc/hiera.yaml

states/test

@@ -1,5 +1,18 @@
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
-{% for env in envs %}
+branches:
-{{ env }}:
+  saltmaster:
-  'os_family:RedHat':
+{%- for branch in branches %}
-{% endfor %}
+    - {{branch}}
+{%- endfor %}
+
+git:
+{%- for branch in branches %}
+  salt_{{branch}}:
+    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
+    path: "/srv/salt/{{branch}}"
+    branch: "{{branch}}"
+    key: "git_actcur"
+    force: {{ "True" if branch == "prod" else "false" }}
+    email: "actcur@actcur.com"
+    name: "Actaeus Curabitur"
+{%- endfor %}

states/top.sls

@@ -1,7 +1,10 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- set envs=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
+{%- if pillar['branches'] is defined -%}
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{%- if pillar['branches']['saltmaster'] is defined -%}
+{%- set envs = pillar['branches']['saltmaster'] -%}
+{%- endif -%}
+{%- endif -%}
 {% for env in envs %}
 {{ env }}:
   'os_family:RedHat':