Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

digital_ocean: don't run update_attr if wait=no #3502

Merged
merged 3 commits into from
Jul 20, 2013
Merged

digital_ocean: don't run update_attr if wait=no #3502

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdbc963
digital_ocean: don't run update_attr if wait=no
bryanlarsen Jul 11, 2013
848b38f
digital_ocean doc update
bryanlarsen Jul 11, 2013
cea812c
update_attr should wait for the full wait timeout before checking for…
bryanlarsen Jul 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions library/cloud/digital_ocean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ options:
- Optional, comma separated list of ssh_key_ids that you would like to be added to the server
wait:
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"
choices: [ "yes", "no" ]
wait_timeout:
Expand Down Expand Up @@ -101,6 +101,8 @@ EXAMPLES = '''
region_id=2
image_id=3
wait_timeout=500
register: my_droplet
- debug: msg="ID: {{ my_droplet.droplet.id }} IP: {{ my_droplet.droplet.ip_address }}"

# Ensure a droplet is present
# If droplet id already exist, will return the droplet details and changed = False
Expand Down Expand Up @@ -187,19 +189,13 @@ class Droplet(JsonfyMixIn):
def is_powered_on(self):
return self.status == 'active'

def update_attr(self, attrs=None, times=5):
def update_attr(self, attrs=None):
if attrs:
for k, v in attrs.iteritems():
setattr(self, k, v)
else:
json = self.manager.show_droplet(self.id)
if not 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:
if json['ip_address']:
self.update_attr(json)

def power_on(self):
Expand All @@ -219,6 +215,8 @@ class Droplet(JsonfyMixIn):
time.sleep(min(20, end_time-time.time()))
self.update_attr()
if self.is_powered_on():
if not self.ip_address:
raise TimeoutError('No ip is found.', self.id)
return
raise TimeoutError('Wait for droplet running timeout', self.id)

Expand All @@ -233,7 +231,6 @@ class Droplet(JsonfyMixIn):
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)
droplet = cls(json)
droplet.update_attr()
return droplet

@classmethod
Expand Down