cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3502 from bryanlarsen/digital_ocean_no_ip

Browse source 
digital_ocean: don't run update_attr if wait=no
This commit is contained in:
Michael DeHaan 2013-07-20 09:04:31 -07:00
commit 6ec5d706ef
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cloud/digital_ocean
View file

@ -59,7 +59,7 @@ options:
- Optional, comma separated list of ssh_key_ids that you would like to be added to the server - Optional, comma separated list of ssh_key_ids that you would like to be added to the server
wait: wait:
description: description:
- Wait for the droplet to be in state 'running' before returning. - Wait for the droplet to be in state 'running' before returning. If wait is "no" an ip_address may not be returned.
default: "yes" default: "yes"
choices: [ "yes", "no" ] choices: [ "yes", "no" ]
wait_timeout: wait_timeout:
@ -101,6 +101,8 @@ EXAMPLES = '''
region_id=2 region_id=2
image_id=3 image_id=3
wait_timeout=500 wait_timeout=500
register: my_droplet
- debug: msg="ID: {{ my_droplet.droplet.id }} IP: {{ my_droplet.droplet.ip_address }}"
# Ensure a droplet is present # Ensure a droplet is present
# If droplet id already exist, will return the droplet details and changed = False # If droplet id already exist, will return the droplet details and changed = False
@ -187,19 +189,13 @@ class Droplet(JsonfyMixIn):
def is_powered_on(self): def is_powered_on(self):
return self.status == 'active' return self.status == 'active'
def update_attr(self, attrs=None, times=5): def update_attr(self, attrs=None):
if attrs: if attrs:
for k, v in attrs.iteritems(): for k, v in attrs.iteritems():
setattr(self, k, v) setattr(self, k, v)
else: else:
json = self.manager.show_droplet(self.id) json = self.manager.show_droplet(self.id)
if not json['ip_address']: if json['ip_address']:
if times > 0:
time.sleep(2)
self.update_attr(times=times-1)
else:
raise TimeoutError('No ip is found.', self.id)
else:
self.update_attr(json) self.update_attr(json)
def power_on(self): def power_on(self):
@ -219,6 +215,8 @@ class Droplet(JsonfyMixIn):
time.sleep(min(20, end_time-time.time())) time.sleep(min(20, end_time-time.time()))
self.update_attr() self.update_attr()
if self.is_powered_on(): if self.is_powered_on():
if not self.ip_address:
raise TimeoutError('No ip is found.', self.id)
return return
raise TimeoutError('Wait for droplet running timeout', self.id) raise TimeoutError('Wait for droplet running timeout', self.id)
@ -233,7 +231,6 @@ class Droplet(JsonfyMixIn):
def add(cls, name, size_id, image_id, region_id, ssh_key_ids=None): def add(cls, name, size_id, image_id, region_id, ssh_key_ids=None):
json = cls.manager.new_droplet(name, size_id, image_id, region_id, ssh_key_ids) json = cls.manager.new_droplet(name, size_id, image_id, region_id, ssh_key_ids)
droplet = cls(json) droplet = cls(json)
droplet.update_attr()
return droplet return droplet
@classmethod @classmethod