cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make rax_clb_ssl module pass sanity check for py3

Browse source
This commit is contained in:
Michael Scherer 2016-10-17 15:26:04 +02:00 committed by Matt Clay
parent 2ceb672016
commit 1bca0847a4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/cloud/rackspace/rax_clb_ssl.py
View file

@ -156,7 +156,7 @@ def cloud_load_balancer_ssl(module, loadbalancer, state, enabled, private_key,
if needs_change:
try:
balancer.add_ssl_termination(**ssl_attrs)
except pyrax.exceptions.PyraxException, e:
except pyrax.exceptions.PyraxException as e:
module.fail_json(msg='%s' % e.message)
changed = True
elif state == 'absent':
@ -164,7 +164,7 @@ def cloud_load_balancer_ssl(module, loadbalancer, state, enabled, private_key,
if existing_ssl:
try:
balancer.delete_ssl_termination()
except pyrax.exceptions.PyraxException, e:
except pyrax.exceptions.PyraxException as e:
module.fail_json(msg='%s' % e.message)
changed = True
@ -176,7 +176,7 @@ def cloud_load_balancer_ssl(module, loadbalancer, state, enabled, private_key,
try:
balancer.update(httpsRedirect=https_redirect)
except pyrax.exceptions.PyraxException, e:
except pyrax.exceptions.PyraxException as e:
module.fail_json(msg='%s' % e.message)
changed = True

1
lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt
View file

@ -35,7 +35,6 @@
/cloud/misc/virt_pool.py
/cloud/profitbricks/profitbricks.py
/cloud/profitbricks/profitbricks_volume.py
/cloud/rackspace/rax_clb_ssl.py
/clustering/consul.py
/clustering/consul_acl.py
/clustering/consul_kv.py