openstack/project-config
Code Issues Proposed changes

infra-package-needs: drop ntp for Focal

Browse Source 
systemd timesyncd is the default mechanism for timesync on Focal;
let's reduce our modification footprint by not overinstalling ntp or
trying to enable it.

Change-Id: I60e15b9101511e9008159b7a0b63f1b4b3febb96
This commit is contained in:
Ian Wienand
2020-04-30 11:07:11 +10:00
parent 0913ec63fc
commit 9485aaaca3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,13 @@
"ntp": "chrony", "ntp": "chrony",
"ntpdate": "" "ntpdate": ""
} }
} },
"ubuntu": {
"focal": {
"ntp": "",
"ntpdate": ""
}
}
}, },
"distro": { "distro": {
"fedora": { "fedora": {

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

@@ -13,7 +13,10 @@ case "$DIB_INIT_SYSTEM" in
;; ;;
systemd) systemd)
if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
systemctl enable ntp.service # stick with default systemd timesyncd on focal
if [[ ${DIB_RELEASE} != 'focal' ]]; then
systemctl enable ntp.service
fi
elif [[ $DISTRO_NAME == "centos" && $DIB_RELEASE -ge 8 ]]; then elif [[ $DISTRO_NAME == "centos" && $DIB_RELEASE -ge 8 ]]; then
systemctl enable chronyd systemctl enable chronyd
else else