valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #175 from runyaga/develop

Browse Source 
check if vm in running state
This commit is contained in:
Joseph Hall 2012-11-29 09:33:43 -08:00
commit ba10895d5a
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
saltcloud/clouds/openstack.py
View File

@ -51,6 +51,7 @@ import logging
import socket import socket
# Import libcloud # Import libcloud
from libcloud.compute.base import NodeState
from libcloud.compute.types import Provider from libcloud.compute.types import Provider
from libcloud.compute.providers import get_driver from libcloud.compute.providers import get_driver
from libcloud.compute.deployment import MultiStepDeployment, ScriptDeployment, SSHKeyDeployment from libcloud.compute.deployment import MultiStepDeployment, ScriptDeployment, SSHKeyDeployment
@ -193,13 +194,14 @@ def create(vm_):
return False return False
not_ready = True not_ready = True
nr_count = 0 nr_count = 50
log.debug('Looking for IP addresses') log.debug('Looking for IP addresses')
while not_ready: while not_ready:
nodelist = list_nodes() nodelist = list_nodes()
private = nodelist[vm_['name']]['private_ips'] private = nodelist[vm_['name']]['private_ips']
public = nodelist[vm_['name']]['public_ips'] public = nodelist[vm_['name']]['public_ips']
if private and not public: running = nodelist[vm_['name']]['state'] == NodeState.RUNNING
if running and private and not public:
log.warn('Private IPs returned, but not public... checking for misidentified IPs') log.warn('Private IPs returned, but not public... checking for misidentified IPs')
for private_ip in private: for private_ip in private:
private_ip = preferred_ip(vm_, [private_ip]) private_ip = preferred_ip(vm_, [private_ip])
@ -214,15 +216,15 @@ def create(vm_):
if ssh_interface(vm_) == 'private_ips' and data.private_ips: if ssh_interface(vm_) == 'private_ips' and data.private_ips:
break break
if public: if running and public:
data.public_ips = public data.public_ips = public
not_ready = False not_ready = False
nr_count += 1 nr_count -= 1
if nr_count > 50: if nr_count == 0:
log.warn('Timed out waiting for a public ip, continuing anyway') log.warn('Timed out waiting for a public ip, continuing anyway')
break break
time.sleep(1) time.sleep(nr_count)
if ssh_interface(vm_) == 'private_ips': if ssh_interface(vm_) == 'private_ips':
ip_address = preferred_ip(vm_, data.private_ips) ip_address = preferred_ip(vm_, data.private_ips)

15
saltcloud/clouds/rackspace.py
View File

@ -29,6 +29,7 @@ import socket
import time import time
# Import libcloud # Import libcloud
from libcloud.compute.base import NodeState
from libcloud.compute.types import Provider from libcloud.compute.types import Provider
from libcloud.compute.providers import get_driver from libcloud.compute.providers import get_driver
from libcloud.compute.deployment import MultiStepDeployment, ScriptDeployment, SSHKeyDeployment from libcloud.compute.deployment import MultiStepDeployment, ScriptDeployment, SSHKeyDeployment
@ -122,13 +123,15 @@ def create(vm_):
return False return False
not_ready = True not_ready = True
nr_count = 0 nr_count = 50
log.debug('Looking for IP addresses') log.debug('Looking for IP addresses')
while not_ready: while not_ready:
nodelist = list_nodes() nodelist = list_nodes()
private = nodelist[vm_['name']]['private_ips'] private = nodelist[vm_['name']]['private_ips']
public = nodelist[vm_['name']]['public_ips'] public = nodelist[vm_['name']]['public_ips']
if private and not public: running = nodelist[vm_['name']]['state'] == NodeState.RUNNING
if running and private and not public:
log.warn('Private IPs returned, but not public... checking for misidentified IPs') log.warn('Private IPs returned, but not public... checking for misidentified IPs')
for private_ip in private: for private_ip in private:
private_ip = preferred_ip(vm_, [private_ip]) private_ip = preferred_ip(vm_, [private_ip])
@ -143,15 +146,15 @@ def create(vm_):
if ssh_interface(vm_) == 'private_ips' and data.private_ips: if ssh_interface(vm_) == 'private_ips' and data.private_ips:
break break
if public: if running and public:
data.public_ips = public data.public_ips = public
not_ready = False not_ready = False
nr_count += 1 nr_count -= 1
if nr_count > 50: if nr_count == 0:
log.warn('Timed out waiting for a public ip, continuing anyway') log.warn('Timed out waiting for a public ip, continuing anyway')
break break
time.sleep(1) time.sleep(nr_count)
if ssh_interface(vm_) == 'private_ips': if ssh_interface(vm_) == 'private_ips':
ip_address = preferred_ip(vm_, data.private_ips) ip_address = preferred_ip(vm_, data.private_ips)