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

Cleaning up, removing debugging tests

Browse source
This commit is contained in:
CEG 2017-06-07 13:49:40 -06:00
parent c78e5feea9
commit 3d9871fe11
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -712,21 +712,9 @@ 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
floating_ips_list = conn.floating_ip_list()
log.debug("Default List:")
log.debug(floating_ips_list)
for fl_ip, opts in six.iteritems(floating_ips_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
try:
fl_ip_dict = conn.floating_ip_show(ip_address)
floating_ip = fl_ip_dict['ip']
log.debug("New:")
log.debug(floating_ip)
except Exception as err:
raise SaltCloudSystemExit(
'Error assigning floating_ip for {0} on Nova\n\n'