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

Fix deprecation warnings in the Google modules.

Browse source
This commit is contained in:
Michael DeHaan 2013-10-19 12:57:47 -04:00
parent d73f5a4df0
commit aa93ce2dc2
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/cloud/gce
View file

@ -178,7 +178,7 @@ except ImportError:
ARGS = getattr(secrets, 'GCE_PARAMS', ()) ARGS = getattr(secrets, 'GCE_PARAMS', ())
KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {}) KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {})
if not ARGS or not KWARGS.has_key('project'): if not ARGS or not 'project' in KWARGS:
print("failed=True " + \ print("failed=True " + \
"msg='Missing GCE connection parametres in libcloud secrets file.'") "msg='Missing GCE connection parametres in libcloud secrets file.'")
sys.exit(1) sys.exit(1)
@ -196,7 +196,7 @@ def get_instance_info(inst):
""" """
metadata = {} metadata = {}
if inst.extra.has_key('metadata') and inst.extra['metadata'].has_key('items'): if 'metadata' in inst.extra and 'items' in inst.extra['metadata']:
for md in inst.extra['metadata']['items']: for md in inst.extra['metadata']['items']:
metadata[md['key']] = md['value'] metadata[md['key']] = md['value']
@ -212,9 +212,9 @@ def get_instance_info(inst):
'network': netname, 'network': netname,
'private_ip': inst.private_ip[0], 'private_ip': inst.private_ip[0],
'public_ip': inst.public_ip[0], 'public_ip': inst.public_ip[0],
'status': inst.extra.has_key('status') and inst.extra['status'] or None, 'status': ('status' in inst.extra) and inst.extra['status'] or None,
'tags': inst.extra.has_key('tags') and inst.extra['tags'] or [], 'tags': ('tags' in inst.extra) and inst.extra['tags'] or [],
'zone': inst.extra.has_key('zone') and inst.extra['zone'].name or None, 'zone': ('zone' in inst.extra) and inst.extra['zone'].name or None,
}) })
def create_instances(module, gce, instance_names): def create_instances(module, gce, instance_names):

4
library/cloud/gce_lb
View file

@ -152,7 +152,7 @@ except ImportError:
ARGS = getattr(secrets, 'GCE_PARAMS', ()) ARGS = getattr(secrets, 'GCE_PARAMS', ())
KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {}) KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {})
if not ARGS or not KWARGS.has_key('project'): if not ARGS or not 'project' in KWARGS:
print("failed=True msg='Missing GCE connection " + \ print("failed=True msg='Missing GCE connection " + \
"parameters in libcloud secrets file.'") "parameters in libcloud secrets file.'")
sys.exit(1) sys.exit(1)
@ -290,7 +290,7 @@ def main():
json_output['external_ip'] = lb.ip json_output['external_ip'] = lb.ip
json_output['port_range'] = lb.port json_output['port_range'] = lb.port
hc_names = [] hc_names = []
if lb.extra.has_key('healthchecks'): if 'healthchecks' in lb.extra:
for hc in lb.extra['healthchecks']: for hc in lb.extra['healthchecks']:
hc_names.append(hc.name) hc_names.append(hc.name)
json_output['httphealthchecks'] = hc_names json_output['httphealthchecks'] = hc_names

2
library/cloud/gce_net
View file

@ -117,7 +117,7 @@ except ImportError:
ARGS = getattr(secrets, 'GCE_PARAMS', ()) ARGS = getattr(secrets, 'GCE_PARAMS', ())
KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {}) KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {})
if not ARGS or not KWARGS.has_key('project'): if not ARGS or not 'project' in KWARGS:
print("failed=True msg='Missing GCE connection " + \ print("failed=True msg='Missing GCE connection " + \
"parameters in libcloud secrets file.'") "parameters in libcloud secrets file.'")
sys.exit(1) sys.exit(1)

5
library/cloud/gce_pd
View file

@ -112,7 +112,7 @@ except ImportError:
ARGS = getattr(secrets, 'GCE_PARAMS', ()) ARGS = getattr(secrets, 'GCE_PARAMS', ())
KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {}) KWARGS = getattr(secrets, 'GCE_KEYWORD_PARAMS', {})
if not ARGS or not KWARGS.has_key('project'): if not ARGS or not 'project' in KWARGS:
print("failed=True " + \ print("failed=True " + \
"msg='Missing GCE connection parameters in libcloud secrets file.'") "msg='Missing GCE connection parameters in libcloud secrets file.'")
sys.exit(1) sys.exit(1)
@ -195,7 +195,8 @@ def main():
module.fail_json(msg="Must supply a size_gb", changed=False) module.fail_json(msg="Must supply a size_gb", changed=False)
try: try:
size_gb = int(round(float(size_gb))) size_gb = int(round(float(size_gb)))
if size_gb < 1: raise Exception if size_gb < 1:
raise Exception
except: except:
module.fail_json(msg="Must supply a size_gb larger than 1 GB", module.fail_json(msg="Must supply a size_gb larger than 1 GB",
changed=False) changed=False)