aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/overcloud_compute.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-06 08:42:59 -0500
committerDan Prince <dprince@redhat.com>2015-02-06 08:42:59 -0500
commitd5eee576cc2a53aaa0b8e9c5d7efe1b27c11dfa1 (patch)
tree4061d944185a67ee10f5dce2516db2387bf38e97 /puppet/overcloud_compute.pp
parent4d470abc589c660cd55e4ced92de234fdf83d882 (diff)
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
Diffstat (limited to 'puppet/overcloud_compute.pp')
-rw-r--r--puppet/overcloud_compute.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/overcloud_compute.pp b/puppet/overcloud_compute.pp
index 2ff31be2..0d2790b2 100644
--- a/puppet/overcloud_compute.pp
+++ b/puppet/overcloud_compute.pp
@@ -24,7 +24,9 @@ if !str2bool(hiera('enable_package_install', 'false')) {
}
}
-include ::ntp
+if count(hiera('ntp::servers')) > 0 {
+ include ::ntp
+}
class { 'nova':
glance_api_servers => join([hiera('glance_protocol'), '://', hiera('glance_host'), ':', hiera('glance_port')]),