Move NTP and Memacache respectively into step 1 and step 2

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index c66460d..9f266b6 100644 (file)
--- 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,11 +373,16 @@ 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 {
 
-  include ::keystone
+  class { '::keystone':
+    sync_db => $sync_db,
+  }
 
   #TODO: need a cleanup-keystone-tokens.sh solution here
   keystone_config {
@@ -479,7 +484,9 @@ if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 {
   Service['neutron-server'] -> Service['neutron-metadata']
 
   include ::cinder
-  include ::cinder::api
+  class { '::cinder::api':
+    sync_db => $sync_db,
+  }
   include ::cinder::glance
   include ::cinder::scheduler
   include ::cinder::volume
@@ -530,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