openstack/puppet-tripleo
Code Issues Proposed changes

Move unfencing to meta_params

Browse Source 
We currently do a requires="unfencing" on a start operation, which is
deprecated and will be removed in pacemaker 2.0

We need to move this to a meta param and since pacemaker has supported
this since the dawn of time we can move to it now.

Closes-Bug: #1771519

Depends-On: I5ec830e092646a3626cacea264de9ad81fcdd124
Change-Id: I788e57b7bff68a934794e008cd6127e19882cd23
This commit is contained in:
Michele Baldessari
2018-05-16 09:22:05 +02:00
parent 08656dc914
commit ea8457499d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/pacemaker/instance_ha.pp
View File

@@ -96,7 +96,7 @@ class tripleo::profile::base::pacemaker::instance_ha (
pacemaker::resource::ocf { 'compute-unfence-trigger': pacemaker::resource::ocf { 'compute-unfence-trigger':
ocf_agent_name => 'pacemaker:Dummy', ocf_agent_name => 'pacemaker:Dummy',
op_params => 'start requires=unfencing', meta_params => 'requires=unfencing',
clone_params => true, clone_params => true,
tries => $pcs_tries, tries => $pcs_tries,
location_rule => { location_rule => {

2
spec/classes/tripleo_profile_base_pacemaker_spec.rb
View File

@@ -49,7 +49,7 @@ describe 'tripleo::profile::base::pacemaker' do
}) })
is_expected.to contain_pcmk_resource('compute-unfence-trigger').with({ is_expected.to contain_pcmk_resource('compute-unfence-trigger').with({
:resource_type => "ocf:pacemaker:Dummy", :resource_type => "ocf:pacemaker:Dummy",
:op_params => "start requires=unfencing", :meta_params => "requires=unfencing",
}) })
is_expected.to contain_pcmk_resource('nova-evacuate').with({ is_expected.to contain_pcmk_resource('nova-evacuate').with({
:resource_type => "ocf:openstack:NovaEvacuate", :resource_type => "ocf:openstack:NovaEvacuate",