summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp12
1 files changed, 7 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index ea2d2108..9f266b6a 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -37,6 +37,10 @@ if $::hostname == downcase(hiera('bootstrap_nodeid')) {
if hiera('step') >= 1 {
+ if count(hiera('ntp::servers')) > 0 {
+ include ::ntp
+ }
+
$controller_node_ips = split(hiera('controller_node_ips'), ',')
$controller_node_names = split(downcase(hiera('controller_node_names')), ',')
class { '::tripleo::loadbalancer' :
@@ -163,10 +167,6 @@ if hiera('step') >= 2 {
}
}
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
-
# MongoDB
if downcase(hiera('ceilometer_backend')) == 'mongodb' {
$mongo_node_ips = split(hiera('mongo_node_ips'), ',')
@@ -373,6 +373,9 @@ MYSQL_HOST=localhost\n",
include ::ceph::profile::osd
}
+ # Memcached
+ include ::memcached
+
} #END STEP 2
if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 {
@@ -534,7 +537,6 @@ if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 {
}
# swift proxy
- include ::memcached
include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck