|
|
|
@ -186,9 +186,9 @@ class Droplet(JsonfyMixIn):
|
|
|
|
|
self.power_on()
|
|
|
|
|
|
|
|
|
|
if wait:
|
|
|
|
|
end_time = time.time()+wait_timeout
|
|
|
|
|
end_time = time.time() + wait_timeout
|
|
|
|
|
while time.time() < end_time:
|
|
|
|
|
time.sleep(min(20, end_time-time.time()))
|
|
|
|
|
time.sleep(min(20, end_time - time.time()))
|
|
|
|
|
self.update_attr()
|
|
|
|
|
if self.is_powered_on():
|
|
|
|
|
if not self.ip_address:
|
|
|
|
@ -283,18 +283,18 @@ def core(module):
|
|
|
|
|
droplet = Droplet.find(module.params['id'])
|
|
|
|
|
if not droplet:
|
|
|
|
|
droplet = Droplet.add(
|
|
|
|
|
name=getkeyordie('name'),
|
|
|
|
|
size_id=getkeyordie('size_id'),
|
|
|
|
|
image_id=getkeyordie('image_id'),
|
|
|
|
|
region_id=getkeyordie('region_id'),
|
|
|
|
|
ssh_key_ids=module.params['ssh_key_ids']
|
|
|
|
|
)
|
|
|
|
|
name=getkeyordie('name'),
|
|
|
|
|
size_id=getkeyordie('size_id'),
|
|
|
|
|
image_id=getkeyordie('image_id'),
|
|
|
|
|
region_id=getkeyordie('region_id'),
|
|
|
|
|
ssh_key_ids=module.params['ssh_key_ids']
|
|
|
|
|
)
|
|
|
|
|
if droplet.is_powered_on():
|
|
|
|
|
changed = False
|
|
|
|
|
droplet.ensure_powered_on(
|
|
|
|
|
wait=getkeyordie('wait'),
|
|
|
|
|
wait_timeout=getkeyordie('wait_timeout')
|
|
|
|
|
)
|
|
|
|
|
wait=getkeyordie('wait'),
|
|
|
|
|
wait_timeout=getkeyordie('wait_timeout')
|
|
|
|
|
)
|
|
|
|
|
module.exit_json(changed=changed, droplet=droplet.to_json())
|
|
|
|
|
|
|
|
|
|
elif state in ('absent', 'deleted'):
|
|
|
|
|