saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

modifying variable calls

Browse source
This commit is contained in:
CEG 2017-06-07 12:35:49 -06:00
parent 9e5e7a38ec
commit 005995e1b0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/clouds/nova.py
View file

@ -712,16 +712,16 @@ def request_instance(vm_=None, call=None):
floating_ip = None
if floating_ip_conf.get('ip_address', None) is not None:
ip_address = floating_ip_conf.get('ip_address', None)
## DEBUG ONLY
# DEBUG ONLY
for fl_ip, opts in six.iteritems(conn.floating_ip_list()):
if opts['fixed_ip'] is None and opts['pool'] == 'External-net':
floating_ip = fl_ip
log.debug("Default:")
log.debug(floating_ip)
## END DEBUG
# END DEBUG
try:
fl_ip = conn.floating_ip_show(ip_address)
floating_ip = str(fl_ip.ip)
fl_ip_dict = conn.floating_ip_show(ip_address)
floating_ip = str(fl_ip_dict['ip'])
log.debug("New:")
log.debug(floating_ip)
except Exception as err: