From 5a649ce32d416dbaa1239c8b8f092216acdcdd01 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 9 Oct 2019 02:45:11 +0000 Subject: [PATCH] infra-pkg-needs: Update pkg-maps for CentOS 8, select chronyd These images are Python3 only -- no python-dev The ntp tools are replaced with chrony on CentOS 8, select it instead. Update the service enablement too. I have done a quick audit and I don't believe any of our base job parts rely on ntpdate as such (except for deprecated devstack-gate; there is actually an unmerged ancient change! [1]). [1] https://review.opendev.org/#/c/352674/1/functions.sh Change-Id: Id2dbda7f114de0be4e4227da179490a17a22eb24 --- nodepool/elements/infra-package-needs/pkg-map | 9 +++++++++ .../post-install.d/80-enable-infra-services | 2 ++ 2 files changed, 11 insertions(+) diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map index daaf5a8052..8eabf9a1cf 100644 --- a/nodepool/elements/infra-package-needs/pkg-map +++ b/nodepool/elements/infra-package-needs/pkg-map @@ -1,4 +1,13 @@ { + "release": { + "centos": { + "8": { + "python-dev": "", + "ntp": "chrony", + "ntpdate": "" + } + } + }, "distro": { "fedora": { "python3-dev": "python3-devel", diff --git a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services index eb44079f84..76b18749bc 100755 --- a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services +++ b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services @@ -14,6 +14,8 @@ case "$DIB_INIT_SYSTEM" in systemd) if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then systemctl enable ntp.service + elif [[ $DISTRO_NAME == "centos" && $DIB_RELEASE -ge 8 ]]; then + systemctl enable chronyd else systemctl enable ntpd.service fi