Merge "Fix primitive_status for pacemaker"

redhat-openstack · Jan 23, 2015 · 537ed9e · 537ed9e
2 parents bb3438c + 908103d
commit 537ed9e
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/lib/puppet/provider/pacemaker_common.rb b/lib/puppet/provider/pacemaker_common.rb
@@ -418,11 +418,17 @@ def constraint_location_remove(primitive, node)
   # @return [String]
   def primitive_status(primitive, node = nil)
     if node
-      nodes.
-          fetch(node, {}).
-          fetch('primitives',{}).
-          fetch(primitive, {}).
-          fetch('status', nil)
+      found_node = nil
+      nodes.each do |k, v|
+        if v.fetch("uname", {}).eql? node
+          found_node = v
+        end
+      end
+      return unless found_node
+      found_node.
+           fetch('primitives',{}).
+           fetch(primitive, {}).
+           fetch('status', nil)
     else
       statuses = []
       nodes.each do |k,v|