summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-22 01:55:45 +0000
committerGerrit Code Review <review@openstack.org>2016-06-22 01:55:45 +0000
commit791b32d506267a2f12f54b6a2ebfd1478d97c25c (patch)
treecda630822ea77c1ae83c4fc2d7eaa9d5a39d2f72 /puppet/manifests
parent5210355461cbaded0c66fee258245699ec469cdc (diff)
parent1bab553fd591810b242963b394daad6019e78f2a (diff)
Merge "Composable roles within services - NTP - ObjectStorage"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_object.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index 3585c993..4fca8f5f 100644
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -23,9 +23,6 @@ if hiera('step') >= 1 {
include ::timezone
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
}
if hiera('step') >= 4 {