From 844cbee5a009aa61cf0e77ac837903cdf3e3c8e1 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 25 Feb 2019 10:24:30 -0700
Subject: [PATCH] Replace ntp with chrony

Chrony is the new default timesync service, but we still were installing
ntp by default. Let's replace the ntp package install with an explicit
chrony install.

Change-Id: Ib6494c6d2745d3573365eca9aae76d677654fbd2
Related-Blueprint: tripleo-chrony
---
 .../install.d/package-installs-overcloud-ceph-storage           | 2 +-
 elements/overcloud-ceph-storage/pkg-map                         | 2 +-
 .../install.d/package-installs-overcloud-compute                | 2 +-
 elements/overcloud-compute/pkg-map                              | 2 +-
 .../install.d/package-installs-overcloud-controller             | 2 +-
 elements/overcloud-controller/pkg-map                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/elements/overcloud-ceph-storage/install.d/package-installs-overcloud-ceph-storage b/elements/overcloud-ceph-storage/install.d/package-installs-overcloud-ceph-storage
index 60b70fec..b1570158 100644
--- a/elements/overcloud-ceph-storage/install.d/package-installs-overcloud-ceph-storage
+++ b/elements/overcloud-ceph-storage/install.d/package-installs-overcloud-ceph-storage
@@ -1 +1 @@
-ntp_package
+chrony_package
diff --git a/elements/overcloud-ceph-storage/pkg-map b/elements/overcloud-ceph-storage/pkg-map
index bd80bf22..2c8ac691 100644
--- a/elements/overcloud-ceph-storage/pkg-map
+++ b/elements/overcloud-ceph-storage/pkg-map
@@ -1,5 +1,5 @@
 {
   "default": {
-    "ntp_package": "ntp"
+    "chrony_package": "chrony"
   }
 }
diff --git a/elements/overcloud-compute/install.d/package-installs-overcloud-compute b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
index 2adaf2a7..c46927aa 100644
--- a/elements/overcloud-compute/install.d/package-installs-overcloud-compute
+++ b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
@@ -2,7 +2,7 @@ dpdk_package
 driverctl_package
 libvirt_package
 nfs_package
-ntp_package
+chrony_package
 pacemaker_remote_package
 sasl_scram_package
 tuned_profiles_cpu_partitioning_package
diff --git a/elements/overcloud-compute/pkg-map b/elements/overcloud-compute/pkg-map
index 015cc207..93fe7b61 100644
--- a/elements/overcloud-compute/pkg-map
+++ b/elements/overcloud-compute/pkg-map
@@ -4,7 +4,7 @@
     "driverctl_package": "driverctl",
     "libvirt_package": "libvirt",
     "nfs_package": "nfs-utils",
-    "ntp_package": "ntp",
+    "chrony_package": "chrony",
     "pacemaker_remote_package": "pacemaker-remote",
     "sasl_scram_package": "cyrus-sasl-scram",
     "tuned_profiles_cpu_partitioning_package": "tuned-profiles-cpu-partitioning"
diff --git a/elements/overcloud-controller/install.d/package-installs-overcloud-controller b/elements/overcloud-controller/install.d/package-installs-overcloud-controller
index 5c770869..a7688905 100644
--- a/elements/overcloud-controller/install.d/package-installs-overcloud-controller
+++ b/elements/overcloud-controller/install.d/package-installs-overcloud-controller
@@ -5,7 +5,7 @@ ipa_admintools_package
 ipa_client_package
 ipxe_bootimgs_package
 nfs_package
-ntp_package
+chrony_package
 pacemaker_package
 pcs_package
 python_openstackclient_package
diff --git a/elements/overcloud-controller/pkg-map b/elements/overcloud-controller/pkg-map
index effb70d4..52a7dc17 100644
--- a/elements/overcloud-controller/pkg-map
+++ b/elements/overcloud-controller/pkg-map
@@ -7,7 +7,7 @@
     "ipa_client_package": "ipa-client",
     "ipxe_bootimgs_package": "ipxe-bootimgs",
     "nfs_package": "nfs-utils",
-    "ntp_package": "ntp",
+    "chrony_package": "chrony",
     "python_openstackclient_package": "python-openstackclient",
     "pacemaker_package": "pacemaker",
     "pcs_package": "pcs"