From c043b9c2b68fc0fa447adf3bb45bce76ff27de42 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 9 Aug 2022 16:50:41 +1000
Subject: [PATCH] nodepool: update package maps for Rocky 9

Update the package maps.  It also seems like matching just "9" will
cover 9-stream and Rocky, which just uses DIB_RELEASE "9".  Also fixup
the 80-enable-haveged to skip on rocky.

Change-Id: Ia352d217d00e10068a463b62f7d9aca72cb88a8c
---
 nodepool/elements/infra-package-needs/install.d/10-packages | 2 +-
 nodepool/elements/infra-package-needs/pkg-map               | 6 ++++++
 .../infra-package-needs/post-install.d/80-enable-haveged    | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nodepool/elements/infra-package-needs/install.d/10-packages b/nodepool/elements/infra-package-needs/install.d/10-packages
index 238b6b7977..2fe1b7e995 100755
--- a/nodepool/elements/infra-package-needs/install.d/10-packages
+++ b/nodepool/elements/infra-package-needs/install.d/10-packages
@@ -20,7 +20,7 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
 fi
 set -e
 
-if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ${DIB_RELEASE} != '9-stream' ]] ; then
+if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ! ${DIB_RELEASE} =~ '9' ]] ; then
     # 9-stream we are just using the default rngd
     # Note: $YUM exposed by centos|rhel-like environment, correct across releases
     ${YUM} -y install --enablerepo=epel haveged
diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index ac90fe8b64..3041e6627b 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -19,6 +19,12 @@
         "ntp": "chrony",
         "ntpdate": "",
         "coreutils": ""
+      },
+      "9": {
+        "python-dev": "",
+        "ntp": "chrony",
+        "ntpdate": "",
+        "iptables": "iptables-services"
        }
     },
     "ubuntu": {
diff --git a/nodepool/elements/infra-package-needs/post-install.d/80-enable-haveged b/nodepool/elements/infra-package-needs/post-install.d/80-enable-haveged
index 63baf5b794..b07a4d9c39 100755
--- a/nodepool/elements/infra-package-needs/post-install.d/80-enable-haveged
+++ b/nodepool/elements/infra-package-needs/post-install.d/80-enable-haveged
@@ -6,8 +6,8 @@ fi
 set -eu
 set -o pipefail
 
-if [[ ${DISTRO_NAME} == 'centos' && ${DIB_RELEASE} = '9-stream' ]]; then
-    # 9-stream we are just using the default rngd
+if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ${DIB_RELEASE} =~ '9' ]]; then
+    # 9/9-stream we are just using the default rngd
     exit 0
 fi