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

Fixed bug where it was impossible to set non-ephemeral external ips. (#19701)

Browse source 
* Fixed bug where it was impossible to set non-ephemeral external ips.

* Fixed variable reference.
This commit is contained in:
rmarsa 2017-01-18 13:13:59 -06:00 committed by Ryan Brown
parent d3c17d632b
commit 32f39a195b
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/modules/cloud/google/gce.py
View file

@ -155,7 +155,7 @@ options:
external_ip:
version_added: "1.9"
description:
- type of external ip, ephemeral by default; alternatively, a list of fixed gce ips or ip names can be given (if there is not enough specified ip, 'ephemeral' will be used). Specify 'none' if no external ip is desired.
- type of external ip, ephemeral by default; alternatively, a fixed gce ip or ip name can be given. Specify 'none' if no external ip is desired.
required: false
default: "ephemeral"
disk_auto_delete:
@ -397,18 +397,15 @@ def create_instances(module, gce, instance_names, number):
if external_ip == "none":
instance_external_ip = None
elif not isinstance(external_ip, basestring):
elif external_ip != "ephemeral":
instance_external_ip = external_ip
try:
if len(external_ip) != 0:
instance_external_ip = external_ip.pop(0)
# check if instance_external_ip is an ip or a name
try:
socket.inet_aton(instance_external_ip)
instance_external_ip = GCEAddress(id='unknown', name='unknown', address=instance_external_ip, region='unknown', driver=gce)
except socket.error:
instance_external_ip = gce.ex_get_address(instance_external_ip)
else:
instance_external_ip = 'ephemeral'
# check if instance_external_ip is an ip or a name
try:
socket.inet_aton(instance_external_ip)
instance_external_ip = GCEAddress(id='unknown', name='unknown', address=instance_external_ip, region='unknown', driver=gce)
except socket.error:
instance_external_ip = gce.ex_get_address(instance_external_ip)
except GoogleBaseError as e:
module.fail_json(msg='Unexpected error attempting to get a static ip %s, error: %s' % (external_ip, e.value))
else: