Merge "EC2: Do not tag an instance until it is running"
This commit is contained in:
commit
f8f4b623ee
|
@ -49,8 +49,6 @@ class AwsInstanceLauncher(NodeLauncher):
|
||||||
attempts += 1
|
attempts += 1
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
instance.create_tags(Tags=[{'Key': 'nodepool_id',
|
|
||||||
'Value': str(self.node.id)}])
|
|
||||||
instance_id = instance.id
|
instance_id = instance.id
|
||||||
self.node.external_id = instance_id
|
self.node.external_id = instance_id
|
||||||
self.zk.storeNode(self.node)
|
self.zk.storeNode(self.node)
|
||||||
|
@ -60,6 +58,8 @@ class AwsInstanceLauncher(NodeLauncher):
|
||||||
state = instance.state.get('Name')
|
state = instance.state.get('Name')
|
||||||
self.log.debug("Instance %s is %s" % (instance_id, state))
|
self.log.debug("Instance %s is %s" % (instance_id, state))
|
||||||
if state == 'running':
|
if state == 'running':
|
||||||
|
instance.create_tags(Tags=[{'Key': 'nodepool_id',
|
||||||
|
'Value': str(self.node.id)}])
|
||||||
break
|
break
|
||||||
time.sleep(0.5)
|
time.sleep(0.5)
|
||||||
instance.reload()
|
instance.reload()
|
||||||
|
|
Loading…
Reference in New Issue