Skip to content

Commit 2f79a27

Browse files
author
Tim Sharpe
committed
So many bugs...
1 parent 2cca40d commit 2f79a27

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

lib/puppet/provider/ha_crm_parameter/crm.rb

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
require 'rexml/document'
22

3-
Puppet::Type.type(:ha_crm_property).provide(:crm) do
3+
Puppet::Type.type(:ha_crm_parameter).provide(:crm) do
44

55
commands :crm_resource => "crm_resource"
66

77
def create
8-
if resource[:meta]
8+
if resource[:meta] == :true
99
crm_resource "-m", "-r", resource[:resource], "-p", resource[:name], "-v", resource[:value]
1010
else
1111
crm_resource "-r", resource[:resource], "-p", resource[:name], "-v", resource[:value]
1212
end
1313
end
1414

1515
def destroy
16-
if resource[:meta]
16+
if resource[:meta] == :true
1717
crm_resource "-m", "-r", resource[:resource], "-d", resource[:name]
1818
else
1919
crm_resource "-r", resource[:resource], "-d", resource[:name]
2020
end
2121
end
2222

2323
def exists?
24-
if resource[:only_run_on_dc] and Facter.value(:ha_cluster_dc) != Facter.value(:fqdn)
25-
resource[:value]
24+
if resource[:only_run_on_dc] and (Facter.value(:ha_cluster_dc) != Facter.value(:fqdn))
25+
true
2626
else
2727
cib = REXML::Document.new File.open("/var/lib/heartbeat/crm/cib.xml")
28-
if resource[:meta]
28+
if resource[:meta] == :true
2929
type = "meta"
3030
else
3131
type = "instance"
@@ -35,9 +35,13 @@ def exists?
3535
nvpair = REXML::XPath.first(cib, "//master[@id='#{resource[:resource]}']/#{type}_attributes/nvpair[@name='#{resource[:name]}']") if nvpair.nil?
3636
nvpair = REXML::XPath.first(cib, "//clone[@id='#{resource[:resource]}']/#{type}_attributes/nvpair[@name='#{resource[:name]}']") if nvpair.nil?
3737
if nvpair.nil?
38-
:absent
38+
false
3939
else
40-
nvpair.attribute(:value).value
40+
if nvpair.attribute(:value).value == resource[:value]
41+
true
42+
else
43+
false
44+
end
4145
end
4246
end
4347
end

lib/puppet/type/ha_crm_parameter.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,17 @@
2020
desc "The value of the parameter"
2121
end
2222

23-
newparam(:meta, :boolean => true) do
23+
newparam(:meta) do
2424
desc "Should this parameter be a meta-parameter?"
2525

2626
newvalues(:true, :false)
2727
defaultto :false
2828
end
29+
30+
newparam(:only_run_on_dc) do
31+
desc "Should this resource only be actioned if the node is the cluster DC?"
32+
33+
newvalues(:true, :false)
34+
defaultto :true
35+
end
2936
end

0 commit comments

Comments
 (0)