openstack/deb-sahara
Code Issues Proposed changes

Merge "Removed cluster retrieving in provisioning engine"

Browse Source
This commit is contained in:
Jenkins 2014-06-16 09:46:04 +00:00 committed by Gerrit Code Review
commit fc155f5c3b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sahara/service/engine.py
View File

@ -56,7 +56,7 @@ class Engine:
ips_assigned = set() ips_assigned = set()
while len(ips_assigned) != len(instances): while len(ips_assigned) != len(instances):
if not g.check_cluster_exists(instances[0].node_group.cluster): if not g.check_cluster_exists(cluster):
return return
for instance in instances: for instance in instances:
if instance.id not in ips_assigned: if instance.id not in ips_assigned:
@ -67,8 +67,7 @@ class Engine:
LOG.info("Cluster '%s': all instances have IPs assigned" % cluster.id) LOG.info("Cluster '%s': all instances have IPs assigned" % cluster.id)
ctx = context.ctx() cluster = conductor.cluster_get(context.ctx(), cluster)
cluster = conductor.cluster_get(ctx, instances[0].node_group.cluster)
instances = g.get_instances(cluster, ips_assigned) instances = g.get_instances(cluster, ips_assigned)
with context.ThreadGroup() as tg: with context.ThreadGroup() as tg: