updated top files to use directory structure rather than trying to hit git - avoids potential issues if git is down and fixed squash

pillars/top.sls

@@ -1,6 +1,6 @@
-{%- 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') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{%- for branch in branches %}
+{%- for env in envs %}
-{{branch}}:
+{{env}}:
   '*':
     - roles
     - servers

squash.sh

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

states/roles/maintain/saltmaster/master

@@ -1,3 +1,4 @@
+{%- 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.
@@ -422,14 +423,10 @@ state_output: terse
 #     - /srv/salt/prod/states
 #
 file_roots:
-{%- if pillar['branches'] is defined -%}
+{%- for env in envs %}
-{%- if pillar['branches']['saltmaster'] is defined -%}
+  {{env}}:
-{%- for branch in pillar['branches']['saltmaster'] %}
+    - /srv/salt/{{env}}/states
-  {{branch}}:
-    - /srv/salt/{{branch}}/states
 {%- endfor %}
-{%- endif %}
-{%- endif %}
 #
 
 # When using multiple environments, each with their own top file, the
@@ -441,15 +438,11 @@ 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 branch in pillar['branches']['saltmaster'] -%}
+{%- for env in envs -%}
-  '{{-branch}}',
+  '{{env}}',
 {%- 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
@@ -570,14 +563,10 @@ hash_type: sha256
 #    - /srv/pillar
 #
 pillar_roots:
-{%- if pillar['branches'] is defined -%}
+{%- for env in envs %}
-{%- if pillar['branches']['saltmaster'] is defined -%}
+  {{env}}:
-{%- for branch in pillar['branches']['saltmaster'] %}
+    - /srv/salt/{{env}}/pillars
-  {{branch}}:
-    - /srv/salt/{{branch}}/pillars
 {%- endfor %}
-{%- endif %}
-{%- endif %}
 #
 #ext_pillar:
 #  - hiera: /etc/hiera.yaml

states/test

@@ -1,18 +1,5 @@
-{%- 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') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-branches:
+{% for env in envs %}
-  saltmaster:
+{{ env }}:
-{%- for branch in branches %}
+  'os_family:RedHat':
-    - {{branch}}
+{% endfor %}
-{%- 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,10 +1,7 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- if pillar['branches'] is defined -%}
+{%- 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']['saltmaster'] is defined -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{%- set envs = pillar['branches']['saltmaster'] -%}
-{%- endif -%}
-{%- endif -%}
 {% for env in envs %}
 {{ env }}:
   'os_family:RedHat':