openstack/project-config
Code Issues Proposed changes

Support Ubuntu 24.04 in nodepool elements

Browse Source 
Extend all the tweaks that we have for Ubuntu 22.04 also apply to the
next LTS release.

Change-Id: Id62d39ba4b2af5f5ffd395b97a5187f5082bd4b0
This commit is contained in:
Dr. Jens Harbott 2024-04-17 11:17:42 +02:00 committed by Dr. Jens Harbott
parent e14c4fbf96
commit f0d909d7c3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,10 @@
"jammy": { "jammy": {
"ntp": "", "ntp": "",
"ntpdate": "" "ntpdate": ""
},
"noble": {
"ntp": "",
"ntpdate": ""
} }
} }
}, },

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

@ -13,7 +13,7 @@ case "$DIB_INIT_SYSTEM" in
;; ;;
systemd) systemd)
# stick with default systemd timesyncd on bookworm, focal and beyond # stick with default systemd timesyncd on bookworm, focal and beyond
if [[ ":bookworm: :focal: :jammy:" =~ :${DIB_RELEASE}: ]]; then if [[ ":bookworm: :focal: :jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
exit 0 exit 0
elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
systemctl enable ntp.service systemctl enable ntp.service

2
nodepool/elements/nodepool-base/root.d/60-apt-phased-updates
View File

@ -23,7 +23,7 @@ set -o pipefail
# NOTE(frickler): Our images builds always install the newest updates, # NOTE(frickler): Our images builds always install the newest updates,
# so we need this in order to avoid conflicts # so we need this in order to avoid conflicts
if [ ${DIB_RELEASE} = jammy ]; then if [[ ":jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
if [ -d "$TARGET_ROOT/etc/apt/apt.conf.d" ]; then if [ -d "$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee $TARGET_ROOT/etc/apt/apt.conf.d/95phased-updates echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee $TARGET_ROOT/etc/apt/apt.conf.d/95phased-updates
fi fi