From: Michele Baldessari <michele@acksyn.org>
Date: Fri, 15 Jul 2016 10:14:52 +0000 (+0200)
Subject: openstack-core resource does not have interleave=true
X-Git-Tag: opnfv-6.0.0~678^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=507e3c696fbe69e806422b2c462857bdd0da6836;p=apex-puppet-tripleo.git

openstack-core resource does not have interleave=true

The dummy openstack-core resource was meant to replace keystone so that
restarting keystone would not restart the whole cloud. When this
resource was introduced the paramter interleave=true was mistakenly left
out.

This causes a simple promote operation on the galera resource to restart
openstack-core and its children.

Change-Id: Ic590005a9419be87e6e6ea131b0ac0630c5afc19
Closes-Bug: 1603381
---

diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index fc58891..de107a9 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -85,7 +85,7 @@ class tripleo::profile::base::pacemaker (
       # Create an openstack-core dummy resource. See RHBZ 1290121
       pacemaker::resource::ocf { 'openstack-core':
         ocf_agent_name => 'heartbeat:Dummy',
-        clone_params   => true,
+        clone_params   => 'interleave=true',
       }
     }
   }