more testing

formulas/class/clients.sls

@@ -14,6 +14,29 @@ include:
   - /states/system/nosleep
   - /states/system/no-recovery
 
+{% if grains['status'] == ('prov' or 'preprod' or 'prod') %}
+
+  - /formulas/common/preprod
+  - /apps/clients/chrome/google-chrome-repo
+  - /apps/clients/packages
+  - /apps/clients/cac/cackey
+
+
+{% if grains['status'] == ('preprod' or 'prod') %}
+
+  - /formulas/common/prod
+  - /apps/clients/arduino/groups
+  - /apps/clients/chrome/configure-chrome-cac
+  - /apps/clients/firefox/configure-firefox-cac
+  - /apps/clients/windows-vm/create-windows-vm
+  - /apps/clients/sssd/configure-sssd
+  - /apps/clients/ssh/configure-ssh
+
+{% endif %}
+{% endif %}
+{% endif %}
+{% endif %}
+
 {% if grains['status'] == 'preprov' %}
 upgrade_status:
   grains.present:
@@ -24,15 +47,10 @@ upgrade_status:
       - sls: /formulas/common/prov
       - sls: /states/net/clients
       - sls: /states/system/dod-root-ca
+      - sls: /states/system/nosleep
+      - sls: /states/system/no-recovery
 {% endif %}
 
-{% if grains['status'] == ('prov' or 'preprod' or 'prod') %}
-
-  - /formulas/common/preprod
-  - /apps/clients/chrome/google-chrome-repo
-  - /apps/clients/packages
-  - /apps/clients/cac/cackey
-
 {% if grains['status'] == 'prov' %}
 upgrade_status:
   grains.present:
@@ -40,36 +58,34 @@ upgrade_status:
     - value: preprod
     - force: true
     - require:
-      - sls: /formulas/class/clients/prov
-      - sls: /formulas/common/preprod
+      - sls: /formulas/common/prov
       - sls: /states/net/clients
+      - sls: /states/system/dod-root-ca
+      - sls: /states/system/nosleep
+      - sls: /states/system/no-recovery
+      - sls: /formulas/common/preprod
+      - sls: /apps/clients/chrome/google-chrome-repo
       - sls: /apps/clients/packages
       - sls: /apps/clients/cac/cackey
-      - sls: /states/system/dod-root-ca
 {% endif %}
 
-{% if grains['status'] == ('preprod' or 'prod') %}
-
-  - /formulas/common/prod
-  - /apps/clients/arduino/groups
-  - /apps/clients/chrome/configure-chrome-cac
-  - /apps/clients/firefox/configure-firefox-cac
-  - /apps/clients/windows-vm/create-windows-vm
-  - /apps/clients/sssd/configure-sssd
-  - /apps/clients/ssh/configure-ssh
-
-{% if grains['status'] == 'preprod' %}
+{% if grains['status'] == 'preprod' or 'prod' %}
 upgrade_status:
   grains.present:
     - name: status
     - value: prod
     - force: true
     - require:
-      - sls: /formulas/class/clients/prov
-      - sls: /formulas/common/preprod
+      - sls: /formulas/common/prov
       - sls: /states/net/clients
-      - sls: /apps/clients/packages
       - sls: /states/system/dod-root-ca
+      - sls: /states/system/nosleep
+      - sls: /states/system/no-recovery
+      - sls: /formulas/common/preprod
+      - sls: /apps/clients/chrome/google-chrome-repo
+      - sls: /apps/clients/packages
+      - sls: /apps/clients/cac/cackey
+      - sls: /formulas/common/prod
       - sls: /apps/clients/arduino/groups
       - sls: /apps/clients/chrome/configure-chrome-cac
       - sls: /apps/clients/firefox/configure-firefox-cac
@@ -77,8 +93,3 @@ upgrade_status:
       - sls: /apps/clients/sssd/configure-sssd
       - sls: /apps/clients/ssh/configure-ssh
 {% endif %}
-
-{% endif %}
-{% endif %}
-{% endif %}
-{% endif %}