openstack
/
puppet-pacemaker
Code Issues Proposed changes

Colocation constraint always has master role. 

All colocation contraint are created with master role.  This is because
currently the code test the if @resource[:master_role] is true.  As the
parameter return the symbol :false, this is considered as a true value.

This fix the problem by making sure the parameter is cast into a
TrueClass, FalseClass.

Closes-Bug: 1583792

Change-Id: Ic00e49a71130b7f00f33a5f698b2de6e5608dcce
This commit is contained in:
Sofer Athlan-Guyot 2016-05-23 10:56:40 +02:00
parent 3f1c3e849a
commit 3cfaf36e2f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/puppet/type/pcmk_constraint.rb
View File

@ -1,3 +1,5 @@
require 'puppet/parameter/boolean'
Puppet::Type.newtype(:pcmk_constraint) do
@doc = "Base constraint definition for a pacemaker constraint"
@ -22,10 +24,7 @@ Puppet::Type.newtype(:pcmk_constraint) do
newparam(:score) do
desc "Score"
end
newparam(:master_slave) do
newparam(:master_slave, :boolean => true, :parent => Puppet::Parameter::Boolean) do
desc "Enable master/slave support with multistage"
newvalues(:true)
newvalues(:false)
end
end

4
spec/acceptance/basic_one_node_spec.rb
View File

@ -53,8 +53,8 @@ describe 'One node install' do
/stonith-fence_ipmilan-ipmi_fence/,
/start ip-192.168.201.59 then start haproxy-clone.*kind:Optional/,
/start ip-2001.dead..28 then start haproxy-clone.*kind:Optional/,
/ip-192.168.201.59 with haproxy-clone \(score:INFINITY\) \(rsc-role:Started\) \(with-rsc-role:Master\)/,
/ip-2001.dead..28 with haproxy-clone \(score:INFINITY\) \(rsc-role:Started\) \(with-rsc-role:Master\)/
/ip-192.168.201.59 with haproxy-clone \(score:INFINITY\)/,
/ip-2001.dead..28 with haproxy-clone \(score:INFINITY\)/
]
)
end