5 files changed, 18 insertions, 9 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 1acdf0d..80015d0 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -72,7 +72,7 @@ class tripleo::profile::pacemaker::database::mysql (
     mysql_server_options    => $mysqld_options,
   }
 
-  if hiera('step') >= 2 and $pacemaker_master {
+  if $step >= 2 and $pacemaker_master {
     if $pacemaker_master {
       pacemaker::resource::ocf { 'galera' :
         ocf_agent_name  => 'heartbeat:galera',
@@ -129,7 +129,7 @@ class tripleo::profile::pacemaker::database::mysql (
     }
   }
 
-  if hiera('step') >= 4 or ( hiera('step') >= 3 and $pacemaker_master ) {
+  if $step >= 4 or ( $step >= 3 and $pacemaker_master ) {
     # At this stage we are guaranteed that the clustercheck db user exists
     # so we switch the resource agent to use it.
     $mysql_clustercheck_password = hiera('mysql_clustercheck_password')
@@ -144,7 +144,7 @@ MYSQL_HOST=localhost\n",
     }
   }
 
-  if hiera('step') >= 5 {
+  if $step >= 5 {
     # We now make sure that the root db password is set to a random one
     # At first installation /root/.my.cnf will be empty and we connect without a root
     # password. On second runs or updates /root/.my.cnf will already be populated
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp
index 9bb96ae..27dcbe9 100644
--- a/manifests/profile/pacemaker/database/redis.pp
+++ b/manifests/profile/pacemaker/database/redis.pp
@@ -18,9 +18,6 @@
 #
 # === Parameters
 #
-# [*redis_vip*]
-#   Redis virtual IP
-#
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
@@ -36,7 +33,6 @@
 #
 
 class tripleo::profile::pacemaker::database::redis (
-  $redis_vip,
   $bootstrap_node       = hiera('bootstrap_nodeid'),
   $enable_load_balancer = hiera('enable_load_balancer', true),
   $step                 = hiera('step'),
diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp
index 98d1b36..c8630ce 100644
--- a/manifests/profile/pacemaker/gnocchi.pp
+++ b/manifests/profile/pacemaker/gnocchi.pp
@@ -59,15 +59,26 @@ class tripleo::profile::pacemaker::gnocchi (
     }
   }
 
-  if $step >= 3 and $pacemaker_master {
+  if $step >= 3 {
     include ::gnocchi
     include ::gnocchi::config
     include ::gnocchi::client
-    include ::gnocchi::db::sync
+    if $pacemaker_master {
+      include ::gnocchi::db::sync
+    }
   }
 
   if $step >= 5 and $pacemaker_master {
 
+    pacemaker::constraint::base { 'keystone-then-gnocchi-metricd-constraint':
+      constraint_type => 'order',
+      first_resource  => 'openstack-core-clone',
+      second_resource => "${::gnocchi::params::metricd_service_name}-clone",
+      first_action    => 'start',
+      second_action   => 'start',
+      require         => [Pacemaker::Resource::Service[$::gnocchi::params::metricd_service_name],
+                          Pacemaker::Resource::Ocf['openstack-core']],
+    }
     pacemaker::constraint::base { 'gnocchi-metricd-then-gnocchi-statsd-constraint':
       constraint_type => 'order',
       first_resource  => "${::gnocchi::params::metricd_service_name}-clone",
diff --git a/manifests/profile/pacemaker/gnocchi/api.pp b/manifests/profile/pacemaker/gnocchi/api.pp
index da65731..ede4c9a 100644
--- a/manifests/profile/pacemaker/gnocchi/api.pp
+++ b/manifests/profile/pacemaker/gnocchi/api.pp
@@ -28,6 +28,7 @@ class tripleo::profile::pacemaker::gnocchi::api (
 ) {
 
   include ::tripleo::profile::pacemaker::gnocchi
+  include ::tripleo::profile::pacemaker::apache
 
   class { '::tripleo::profile::base::gnocchi::api':
     step    => $step,
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index e8e12a3..1cd5178 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -51,6 +51,7 @@ class tripleo::profile::pacemaker::keystone (
   }
 
   include ::tripleo::profile::base::keystone
+  include ::tripleo::profile::pacemaker::apache
 
   if $step >= 5 and $pacemaker_master and $enable_load_balancer {
     pacemaker::constraint::base { 'haproxy-then-keystone-constraint':