From d5eee576cc2a53aaa0b8e9c5d7efe1b27c11dfa1 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 6 Feb 2015 08:42:59 -0500 Subject: puppet: only enable Ntp if ntp::servers is set Not all installations have an NtpServer configured and if they don't the ntp service will fail to startup correctly. This patch makes it so that ntp is only enabled if the ntp::servers array is greater than 0. Change-Id: I8417f87ad2a3c1237ebb00ee1232b5313cd45d46 --- puppet/overcloud_object.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'puppet/overcloud_object.pp') diff --git a/puppet/overcloud_object.pp b/puppet/overcloud_object.pp index c407afad..8d0ad783 100644 --- a/puppet/overcloud_object.pp +++ b/puppet/overcloud_object.pp @@ -23,7 +23,10 @@ if !str2bool(hiera('enable_package_install', 'false')) { } } } -include ::ntp + +if count(hiera('ntp::servers')) > 0 { + include ::ntp +} include ::swift class {'swift::storage::all': -- cgit 1.2.3-korg