From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 18 May 2015 13:29:09 +0000 (-0400)
Subject: Ensure sync_db is consumed by Keystone and Cinder classes
X-Git-Tag: opnfv-6.0.0~2548^2~7
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7b6c2a4a7d596df25f249e653086ffb9225d3a37;p=apex-tripleo-heat-templates.git

Ensure sync_db is consumed by Keystone and Cinder classes

Change-Id: Ia8cb04b214c71afc884647fb20be3cc1a309c194
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index c66460d9..ea2d2108 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -377,7 +377,9 @@ MYSQL_HOST=localhost\n",
 
 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 +481,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