From 6bcc660e3a6a4a4febf9b0d1c3e10307a2734833 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 19 Apr 2018 21:39:31 -0700 Subject: [PATCH] Always deploy NTP No matter how many NTP servers we have in undercloud.conf, we need NTP service running correctly, so the undercloud is always on time. The default configuration already provide sane defaults (X.centos.pool.ntp.org) so let's configure the service all the time. Closes-Bug: #1765839 Change-Id: I946f055b119ea878c893bd333ebb5f2c9d68ea6d (cherry picked from commit 0498f5a64eaeed2f760aa771bc7d1e1db898a24a) --- elements/puppet-stack-config/puppet-stack-config.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 8206eb69d..ffda0bc7e 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -63,9 +63,7 @@ Keystone::Resource::Service_identity { default_domain => hiera('keystone_default_domain'), } -if count(hiera('ntp::servers')) > 0 { - include ::tripleo::profile::base::time::ntp -} +include ::tripleo::profile::base::time::ntp include ::rabbitmq Class['::rabbitmq'] -> Service['httpd']