openstack/project-config
Code Issues Proposed changes

nodepool: update package maps for Rocky 9

Browse Source 
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
This commit is contained in:
Ian Wienand 2022-08-09 16:50:41 +10:00
parent 9f7824377f
commit c043b9c2b6
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/elements/infra-package-needs/install.d/10-packages
View File

@ -20,7 +20,7 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
fi fi
set -e 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 # 9-stream we are just using the default rngd
# Note: $YUM exposed by centos|rhel-like environment, correct across releases # Note: $YUM exposed by centos|rhel-like environment, correct across releases
${YUM} -y install --enablerepo=epel haveged ${YUM} -y install --enablerepo=epel haveged

6
nodepool/elements/infra-package-needs/pkg-map
View File

@ -19,6 +19,12 @@
"ntp": "chrony", "ntp": "chrony",
"ntpdate": "", "ntpdate": "",
"coreutils": "" "coreutils": ""
},
"9": {
"python-dev": "",
"ntp": "chrony",
"ntpdate": "",
"iptables": "iptables-services"
} }
}, },
"ubuntu": { "ubuntu": {

4
nodepool/elements/infra-package-needs/post-install.d/80-enable-haveged
View File

@ -6,8 +6,8 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [[ ${DISTRO_NAME} == 'centos' && ${DIB_RELEASE} = '9-stream' ]]; then if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ${DIB_RELEASE} =~ '9' ]]; then
# 9-stream we are just using the default rngd # 9/9-stream we are just using the default rngd
exit 0 exit 0
fi fi