aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 16:19:30 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 16:19:30 +0000
commita2614491be1cae82e4b04337184b75644633ce3f (patch)
treeba4cf25e3c25c770f5cb0296c3ce816b13d9a94a /puppet/manifests/overcloud_controller_pacemaker.pp
parentd6eec7809a57e21faea1737a0339e1f84b96b28a (diff)
parent296bffde893dbbf36c62d664e24e2584b89b8070 (diff)
Merge "Composable roles within services - NTP"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index c7f64f1..0bee6b0 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -59,10 +59,6 @@ if hiera('step') >= 1 {
include ::timezone
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
-
$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {