From: Jay Dobies <jason.dobies@redhat.com>
Date: Wed, 29 Apr 2015 14:15:26 +0000 (-0400)
Subject: Add Keystone as Pacemaker resource
X-Git-Tag: opnfv-6.0.0~2545^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=13044ecee11e476a8b2f62091d9b517d46813573;p=apex-tripleo-heat-templates.git

Add Keystone as Pacemaker resource

Change-Id: I4631f962415164975143e94ec0b251ee5972c552
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 99344532..a83b073a 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -363,8 +363,8 @@ if hiera('step') >= 3 {
 
   class { '::keystone':
     sync_db => $sync_db,
-    manage_service => $non_pcmk_start,
-    enabled => $non_pcmk_start,
+    manage_service => false,
+    enabled => false,
   }
 
   #TODO: need a cleanup-keystone-tokens.sh solution here
@@ -696,6 +696,11 @@ if hiera('step') >= 3 {
 if hiera('step') >= 4 {
   if $pacemaker_master {
 
+    # Keystone
+    pacemaker::resource::service { $::keystone::params::service_name :
+      clone_params => "interleave=true",
+    }
+
     # Cinder
     pacemaker::resource::service { $::cinder::params::api_service :
       clone_params => "interleave=true",