Flatten

Blackavar · Aug 3, 2012 · 1fdba73 · 1fdba73
1 parent 7d37b6c
commit 1fdba73
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/crowbar_framework/app/models/deployer_service.rb b/crowbar_framework/app/models/deployer_service.rb
@@ -223,6 +223,13 @@ def transition(inst, name, state)
       end
     end
     if state == "installing"
+      # build a list of current and pending roles to check against
+      roles = []
+      node.crowbar["crowbar"]["pending"].each do |k,v|
+        roles << v
+      end unless node.crowbar["crowbar"]["pending"].nil?
+      roles << node.run_list_to_roles
+      roles.flatten!
       done = false
       role = RoleObject.find_role_by_name "deployer-config-#{inst}"
       role.default_attributes["deployer"]["os_map"].each do |match|