aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-18 11:44:57 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-05-18 11:47:53 -0400
commit5b6bcf0245061db1ca5bdaf59fc371d982f00b12 (patch)
tree8af17825b5b4ac3351afb4e681934e5ec1302192 /puppet/manifests
parent7b6c2a4a7d596df25f249e653086ffb9225d3a37 (diff)
Move NTP and Memacache respectively into step 1 and step 2
NTP synchronization is moved to to step 1 where initial Pacemaker configuration is performed. Memacached is moved to step 2 to make sure it is up before the OpenStack services are started. Change-Id: I84121a687ee5ddb522239ecefd4d1d76c2f910b5
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