Merge branch 'master' of https://git.cybbh.space/vta/saltstack into ubuntu-stigs

apps/clients/googleearth/google-earth-repo.sls

+google-earth-repo:
+  pkgrepo.managed:
+    - humanname: Google Earth
+    - name: deb [arch=amd64] http://dl.google.com/linux/earth/deb/ stable main
+    - file: /etc/apt/sources.list.d/google-earth.list
+    - key_url: https://dl.google.com/linux/linux_signing_key.pub

formulas/class/clients.sls

@@ -17,6 +17,7 @@ include:
 {% if (grains['status'] == 'prov') or (grains['status'] == 'preprod') or (grains['status'] == 'prod') %}
   - /formulas/common/preprod
   - /apps/clients/chrome/google-chrome-repo
+  - /apps/clients/googleearth/google-earth-repo
   - /apps/clients/atom/atom-repo
   - /apps/clients/gitlfs/git-lfs-repo
   - /apps/clients/packages
@@ -34,7 +35,7 @@ include:
   - /apps/clients/ssh/configure-ssh
   - /apps/clients/atom/configure-atom
   - /apps/clients/stig/configure-stig
-  - /apps/clients/git/configure-git 
+  - /apps/clients/git/configure-git
 {% endif %}
 
 {% if grains['status'] == 'preprov' %}
@@ -65,6 +66,7 @@ upgrade_status_to_preprod:
       - sls: /states/system/nosleep
       - sls: /states/system/no-recovery
       - sls: /apps/clients/chrome/google-chrome-repo
+      - sls: /apps/clients/googleearth/google-earth-repo
       - sls: /apps/clients/packages
       - sls: /apps/clients/cac/cackey
 {% endif %}
@@ -83,6 +85,7 @@ upgrade_status_to_prod:
       - sls: /states/system/nosleep
       - sls: /states/system/no-recovery
       - sls: /apps/clients/chrome/google-chrome-repo
+      - sls: /apps/clients/googleearth/google-earth-repo
       - sls: /apps/clients/packages
       - sls: /apps/clients/cac/cackey
       - sls: /apps/clients/arduino/groups

pillar/apps/openstack/heat/configuration.sls

@@ -5,6 +5,7 @@ heat_configuration:
     - heat-engine
     - python-openstackclient
     - python-tornado
+    - python-zunclient
   hosts:
     - 10.10.5.170
   heat_members:

pillar/infrastructure/clients/packages.sls

@@ -39,3 +39,4 @@ client_packages:
     - git-lfs
     - kdenlive
     - python3-venv
+    - google-earth-pro-stable