From 8e10a72ea7c7a67af57e2bf436a3dde0864a0ab7 Mon Sep 17 00:00:00 2001
From: amanda <amanda.mcguinness@ammeonsolutions.com>
Date: Fri, 28 Jan 2022 17:20:06 +0000
Subject: [PATCH] Add rocky

---
 actions/create_vm_role.meta.yaml | 9 ++-------
 actions/set_hostname_cloud.yaml  | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/actions/create_vm_role.meta.yaml b/actions/create_vm_role.meta.yaml
index 9ca5a131..fb432ab3 100755
--- a/actions/create_vm_role.meta.yaml
+++ b/actions/create_vm_role.meta.yaml
@@ -59,11 +59,6 @@ parameters:
       - pkg_UBUNTU20
       - pkg_RHEL7
       - pkg_RHEL8
-      # TODO: Remove these
+      # TODO: Remove these - seem to be referenced in upgrade workflow
       - pkg_CENTOS7
-      - pkg_CENTOS8
-      # TODO: Remove this
-      - ubuntu
-      # TODO: Remove these
-      - centos7
-      - centos8
+      - pkg_ROCKY8
diff --git a/actions/set_hostname_cloud.yaml b/actions/set_hostname_cloud.yaml
index 791dd075..ed7f6819 100755
--- a/actions/set_hostname_cloud.yaml
+++ b/actions/set_hostname_cloud.yaml
@@ -23,9 +23,9 @@
         # Keep these though
         - "UBUNTU18"
         - "UBUNTU20"
-        # TODO: Remove these
+        # TODO: Remove these - but appear to be used in upgrade workflow
         - "pkg_CENTOS7"
-        - "pkg_CENTOS8"
+        - "pkg_ROCKY8"
         # Keep these though
         - "pkg_RHEL7"
         - "pkg_RHEL8"
@@ -33,7 +33,7 @@
         - "pkg_UBUNTU20"
     cmd:
       immutable: true
-      default: '{% if distro in ["RHEL7","RHEL8","pkg_CENTOS7","pkg_CENTOS8","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU18","UBUNTU18","pkg_UBUNTU20","UBUNTU20"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
+      default: '{% if distro in ["RHEL7","RHEL8","pkg_CENTOS7","pkg_ROCKY8","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU18","UBUNTU18","pkg_UBUNTU20","UBUNTU20"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
     redhat:
       type: "string"
       immutable: true