openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Create openstack-core resource regardless of enable_load_balancer 

The fix is not needed in master because it had already landed
when the corresponding composable service change was implemented
via commit 40ad289910 ("Deploy
Loadbalancer as a composable role")

Change-Id: I8ed0109eac8a4c336dadb90fb6204b57dfb17dc2
Closes-Bug: 1599913
This commit is contained in:
Giulio Fidente 2016-07-07 17:53:30 +02:00 committed by Michele Baldessari
parent 298d39990d
commit 54c1534709
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -237,15 +237,16 @@ if hiera('step') >= 2 {
if $pacemaker_master {
include ::pacemaker::resource_defaults
# Create an openstack-core dummy resource. See RHBZ 1290121
pacemaker::resource::ocf { 'openstack-core':
ocf_agent_name => 'heartbeat:Dummy',
clone_params => true,
}
if $enable_load_balancer {
include ::pacemaker::resource_defaults
# Create an openstack-core dummy resource. See RHBZ 1290121
pacemaker::resource::ocf { 'openstack-core':
ocf_agent_name => 'heartbeat:Dummy',
clone_params => true,
}
# FIXME: we should not have to access tripleo::loadbalancer class
# parameters here to configure pacemaker VIPs. The configuration
# of pacemaker VIPs could move into puppet-tripleo or we should