Deploy non primary controllers at the same time

loles · Jan 29, 2014 · 88391c4 · 88391c4
1 parent 3073508
commit 88391c4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
@@ -294,13 +294,16 @@ def set_deployment_priorities(cls, nodes):
         for n in cls.by_role(nodes, 'storage'):
             n['priority'] = storage_prior
 
+        if not cls.by_role(nodes, 'primary-controller'):
+            cls.set_primary_controller(nodes)
         # Deploy primary-controller
         for n in cls.by_role(nodes, 'primary-controller'):
             n['priority'] = prior.next
 
-        # Then deploy other controllers one by one
+        priority_controllers = prior.next 
+        # Then deploy other controllers
         for n in cls.by_role(nodes, 'controller'):
-            n['priority'] = prior.next
+            n['priority'] = priority_controllers
 
         other_nodes_prior = prior.next
         for n in cls.not_roles(nodes, ['primary-swift-proxy',