From d1d9db1feb5a71db4c0d514f914a0f4ff54e7e0e Mon Sep 17 00:00:00 2001
From: Actaeus Curabitur <actcur@actcur.com>
Date: Thu, 8 Sep 2022 08:38:17 -0500
Subject: [PATCH] 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                         |  6 ++---
 squash.sh                               |  2 +-
 states/roles/maintain/saltmaster/master | 29 ++++++++-----------------
 states/test                             | 23 +++++---------------
 states/top.sls                          |  7 ++----
 5 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/pillars/top.sls b/pillars/top.sls
index 61aec66..53aa3c7 100644
--- a/pillars/top.sls
+++ b/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') -%}
-{%- for branch in branches %}
-{{branch}}:
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{%- for env in envs %}
+{{env}}:
   '*':
     - roles
     - servers
diff --git a/squash.sh b/squash.sh
index 51c9d09..87eb10e 100644
--- a/squash.sh
+++ b/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;
diff --git a/states/roles/maintain/saltmaster/master b/states/roles/maintain/saltmaster/master
index aea5fa0..c45da74 100644
--- a/states/roles/maintain/saltmaster/master
+++ b/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 -%}
-{%- if pillar['branches']['saltmaster'] is defined -%}
-{%- for branch in pillar['branches']['saltmaster'] %}
-  {{branch}}:
-    - /srv/salt/{{branch}}/states
+{%- for env in envs %}
+  {{env}}:
+    - /srv/salt/{{env}}/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'] -%}
-  '{{-branch}}',
+{%- for env in envs -%}
+  '{{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 -%}
-{%- if pillar['branches']['saltmaster'] is defined -%}
-{%- for branch in pillar['branches']['saltmaster'] %}
-  {{branch}}:
-    - /srv/salt/{{branch}}/pillars
+{%- for env in envs %}
+  {{env}}:
+    - /srv/salt/{{env}}/pillars
 {%- endfor %}
-{%- endif %}
-{%- endif %}
 #
 #ext_pillar:
 #  - hiera: /etc/hiera.yaml
diff --git a/states/test b/states/test
index 89ca9da..8d45562 100644
--- a/states/test
+++ b/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') -%}
-branches:
-  saltmaster:
-{%- for branch in branches %}
-    - {{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 %}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{% for env in envs %}
+{{ env }}:
+  'os_family:RedHat':
+{% endfor %}
diff --git a/states/top.sls b/states/top.sls
index 302b1f7..6cb7166 100644
--- a/states/top.sls
+++ b/states/top.sls
@@ -1,10 +1,7 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- if pillar['branches'] is defined -%}
-{%- if pillar['branches']['saltmaster'] is defined -%}
-{%- set envs = pillar['branches']['saltmaster'] -%}
-{%- endif -%}
-{%- endif -%}
+{%- 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') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
 {% for env in envs %}
 {{ env }}:
   'os_family:RedHat':