openstack/project-config
Code Issues Proposed changes

Add Rocky Linux to nodepool elements tooling

Browse Source 
Change-Id: I2a94a34b1518c90ef5f0d91c9131482520c38c62
This commit is contained in:
Neil Hanlon 2022-02-15 16:01:53 -05:00
parent e14c59a6e1
commit cc6b6de7a0
No known key found for this signature in database
GPG Key ID: 705BC21EC3C70F34
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,8 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
fi
set -e
if [[ "$DISTRO_NAME" == centos && ${DIB_RELEASE} != '9-stream' ]] ; then
if [[ "$DISTRO_NAME" =~ ^(centos|rocky)$ && ${DIB_RELEASE} != '9-stream' ]] ; then
# 9-stream we are just using the default rngd
# Note: $YUM exposed by centos environment, correct across releases
# Note: $YUM exposed by centos|rhel-like environment, correct across releases
${YUM} -y install --enablerepo=epel haveged
fi

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

@ -13,6 +13,13 @@
"iptables": "iptables-services"
}
},
"rocky": {
"8": {
"python-dev": "",
"ntp": "chrony",
"ntpdate": ""
}
},
"ubuntu": {
"focal": {
"ntp": "",

2
nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
View File

@ -17,7 +17,7 @@ case "$DIB_INIT_SYSTEM" in
if [[ ${DIB_RELEASE} != 'focal' ]]; then
systemctl enable ntp.service
fi
elif [[ ( $DISTRO_NAME == "centos" && $DIB_RELEASE > 7 ) || $DISTRO_NAME == "fedora" ]]; then
elif [[ ( $DISTRO_NAME == "centos" && $DIB_RELEASE > 7 ) || $DISTRO_NAME == "fedora" || $DISTRO_NAME == "rocky" ]]; then
systemctl enable chronyd
else
systemctl enable ntpd.service

6
nodepool/elements/nodepool-base/finalise.d/89-boot-settings
View File

@ -68,7 +68,7 @@ mv /tmp/forwarding.conf /etc/unbound/
chown root:root /etc/unbound/forwarding.conf
chmod a+r /etc/unbound/forwarding.conf
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
LOG_FILE="/var/lib/unbound/unbound.log"
else
LOG_FILE="/var/log/unbound.log"
@ -82,7 +82,7 @@ server:
verbosity: 5"
echo "$UNBOUND_LOGGING_CONF" > /tmp/unbound-logging.conf
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|opensuse|openeuler) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|opensuse|openeuler|rocky) ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d
elif [[ "$DISTRO_NAME" =~ 'gentoo' ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d
@ -185,7 +185,7 @@ sed -i -e 's/dlv-anchor-file:/#dlv-anchor-file:/g' /etc/unbound/unbound.conf
# Tripleo uses dhcp
dhcp_file=''
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
dhcp_file=/etc/dhcp/dhclient-eth0.conf
elif [[ "$DISTRO_NAME" =~ (debian|ubuntu|gentoo) ]] ; then
dhcp_file=/etc/dhcp/dhclient.conf

2
nodepool/elements/nodepool-base/install.d/20-iptables
View File

@ -24,7 +24,7 @@ if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
rules_dir=/etc/iptables
ipv4_rules=${rules_dir}/rules.v4
ipv6_rules=${rules_dir}/rules.v6
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
rules_dir=/etc/sysconfig
ipv4_rules=${rules_dir}/iptables
ipv6_rules=${rules_dir}/ip6tables

4
nodepool/elements/nodepool-base/post-install.d/20-iptables
View File

@ -22,7 +22,7 @@ set -e
if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
service_name=netfilter-persistent
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
service_name=iptables
elif [[ "$DISTRO_NAME" == 'opensuse' ]] ; then
# handle iptables through init.d instead of a service
@ -48,7 +48,7 @@ case "$DIB_INIT_SYSTEM" in
else
systemctl enable ${service_name}.service
fi
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler|rocky) ]] ; then
systemctl enable ip6tables.service
fi
;;