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

Fix lint, typos and readability

Browse Source
This commit is contained in:
Bo Maryniuk 2017-04-22 10:19:05 +02:00
parent 116c96a4b7
commit b2e85de85d
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
salt/cloud/clouds/nova.py
View File

@ -725,20 +725,12 @@ def request_instance(vm_=None, call=None):
def _query_node_data(vm_, data, conn): def _query_node_data(vm_, data, conn):
try: try:
node = show_instance(vm_['name'], 'action') node = show_instance(vm_['name'], 'action')
log.debug( log.debug('Loaded node data for {0}:'
'Loaded node data for {0}:\n{1}'.format( '\n{1}'.format(vm_['name'], pprint.pformat(node)))
vm_['name'],
pprint.pformat(node)
)
)
except Exception as err: except Exception as err:
log.error( # Show the traceback if the debug logging level is enabled
'Failed to get nodes list: {0}'.format( log.error('Failed to get nodes list: {0}'.format(err),
err exc_info_on_loglevel=logging.DEBUG)
),
# Show the traceback if the debug logging level is enabled
exc_info_on_loglevel=logging.DEBUG
)
# Trigger a failure in the wait for IP function # Trigger a failure in the wait for IP function
return False return False
@ -749,18 +741,14 @@ def _query_node_data(vm_, data, conn):
if rackconnect(vm_) is True: if rackconnect(vm_) is True:
extra = node.get('extra', {}) extra = node.get('extra', {})
rc_status = extra.get('metadata', {}).get( rc_status = extra.get('metadata', {}).get('rackconnect_automation_status', '')
'rackconnect_automation_status', '')
if rc_status != 'DEPLOYED': if rc_status != 'DEPLOYED':
log.debug('Waiting for Rackconnect automation to complete') log.debug('Waiting for Rackconnect automation to complete')
return return
if managedcloud(vm_) is True: if managedcloud(vm_) is True:
extra = conn.server_show_libcloud( extra = conn.server_show_libcloud(node['id']).extra
node['id'] mc_status = extra.get('metadata', {}).get('rax_service_level_automation', '')
).extra
mc_status = extra.get('metadata', {}).get(
'rax_service_level_automation', '')
if mc_status != 'Complete': if mc_status != 'Complete':
log.debug('Waiting for managed cloud automation to complete') log.debug('Waiting for managed cloud automation to complete')
@ -796,15 +784,19 @@ def _query_node_data(vm_, data, conn):
# network. If that network does not exist in the 'addresses' dictionary, then SaltCloud will # network. If that network does not exist in the 'addresses' dictionary, then SaltCloud will
# use the initial access_ip, and not overwrite anything. # use the initial access_ip, and not overwrite anything.
if any((cloudnetwork(vm_), rackconnect(vm_))) and (ssh_interface(vm_) != 'private_ips' or rcv3) and access_ip != '': if (any((cloudnetwork(vm_), rackconnect(vm_)))
data.public_ips = [access_ip, ] and (ssh_interface(vm_) != 'private_ips' or rcv3)
and access_ip != ''):
data.public_ips = [access_ip]
return data return data
result = [] result = []
if 'private_ips' not in node and 'public_ips' not in node and \ if ('private_ips' not in node
'floating_ips' not in node and 'fixed_ips' not in node and \ and 'public_ips' not in node
'access_ip' in node.get('extra', {}): and 'floating_ips' not in node
and 'fixed_ips' not in node
and 'access_ip' in node.get('extra', {})):
result = [node['extra']['access_ip']] result = [node['extra']['access_ip']]
private = node.get('private_ips', []) private = node.get('private_ips', [])
@ -813,10 +805,8 @@ def _query_node_data(vm_, data, conn):
floating = node.get('floating_ips', []) floating = node.get('floating_ips', [])
if private and not public: if private and not public:
log.warning( log.warning('Private IPs returned, but not public. '
'Private IPs returned, but not public... Checking for ' 'Checking for misidentified IPs')
'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])
if private_ip is False: if private_ip is False:
@ -824,12 +814,8 @@ def _query_node_data(vm_, data, conn):
if salt.utils.cloud.is_public_ip(private_ip): if salt.utils.cloud.is_public_ip(private_ip):
log.warning('{0} is a public IP'.format(private_ip)) log.warning('{0} is a public IP'.format(private_ip))
data.public_ips.append(private_ip) data.public_ips.append(private_ip)
log.warning( log.warning('Public IP address was not ready when we last checked. '
( 'Appending public IP address now.')
'Public IP address was not ready when we last'
' checked. Appending public IP address now.'
)
)
public = data.public_ips public = data.public_ips
else: else:
log.warning('{0} is a private IP'.format(private_ip)) log.warning('{0} is a private IP'.format(private_ip))