From c6027588a5206edb20326182f38ade18768e098f Mon Sep 17 00:00:00 2001 From: Robert Stuart Date: Sun, 31 May 2020 13:01:45 +1000 Subject: [PATCH] issue #485: remove score parameter from cs_order --- lib/puppet/provider/cs_order/crm.rb | 4 +--- lib/puppet/provider/cs_order/pcs.rb | 8 -------- lib/puppet/type/cs_order.rb | 10 ---------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/lib/puppet/provider/cs_order/crm.rb b/lib/puppet/provider/cs_order/crm.rb index 716142f5..24eaf7eb 100644 --- a/lib/puppet/provider/cs_order/crm.rb +++ b/lib/puppet/provider/cs_order/crm.rb @@ -54,7 +54,6 @@ def self.instances ensure: :present, first: first, second: second, - score: items['score'], symmetrical: symmetrical, provider: name } @@ -71,7 +70,6 @@ def create ensure: :present, first: @resource[:first], second: @resource[:second], - score: @resource[:score], symmetrical: @resource[:symmetrical], kind: @resource[:kind], cib: @resource[:cib] @@ -93,7 +91,7 @@ def flush return if @property_hash.empty? updated = 'order ' - updated << "#{@property_hash[:name]} #{@property_hash[:score]}: " + updated << "#{@property_hash[:name]} " updated << "#{@property_hash[:first]} #{@property_hash[:second]} symmetrical=#{@property_hash[:symmetrical]}" updated << " kind=#{@property_hash[:kind]}" if feature? :kindness debug("Loading update: #{updated}") diff --git a/lib/puppet/provider/cs_order/pcs.rb b/lib/puppet/provider/cs_order/pcs.rb index 788b2369..c26225a2 100644 --- a/lib/puppet/provider/cs_order/pcs.rb +++ b/lib/puppet/provider/cs_order/pcs.rb @@ -47,11 +47,6 @@ def self.instances else items['then'] end - score = if items['score'] - items['score'] - else - 'INFINITY' - end kind = if items['kind'] items['kind'] else @@ -70,7 +65,6 @@ def self.instances ensure: :present, first: first, second: second, - score: score, kind: kind, symmetrical: symmetrical, provider: name, @@ -90,7 +84,6 @@ def create ensure: :present, first: @resource[:first], second: @resource[:second], - score: @resource[:score], kind: @resource[:kind], symmetrical: @resource[:symmetrical], new: true @@ -126,7 +119,6 @@ def flush items = @property_hash[:second].split(':') cmd << items[1] cmd << items[0] - cmd << @property_hash[:score] cmd << "kind=#{@property_hash[:kind]}" cmd << "id=#{@property_hash[:name]}" cmd << "symmetrical=#{@property_hash[:symmetrical]}" diff --git a/lib/puppet/type/cs_order.rb b/lib/puppet/type/cs_order.rb index 19291eeb..53abc6d1 100644 --- a/lib/puppet/type/cs_order.rb +++ b/lib/puppet/type/cs_order.rb @@ -54,16 +54,6 @@ also be added to your manifest." end - newproperty(:score) do - desc "The priority of the this ordered grouping. Primitives can be a part - of multiple order groups and so there is a way to control which - primitives get priority when forcing the order of state changes on - other primitives. This value can be an integer but is often defined - as the string INFINITY." - - defaultto 'INFINITY' - end - newproperty(:kind, required_features: :kindness) do desc "How to enforce the constraint.