Enable path expansion in GCE modules

This is basically a replay of #16064 from `gce.py` to other pertinent
`gce_*.py` files. It enables expansions of paths in `gce.ini` like
`~/.project.json`
pull/22551/head
Johannes Kohnen 8 years ago committed by Brian Coca
parent 0d0c38400f
commit cc2eecc247

@ -179,8 +179,8 @@ def main():
region=dict(required=True), region=dict(required=True),
service_account_email=dict(), service_account_email=dict(),
service_account_permissions=dict(type='list'), service_account_permissions=dict(type='list'),
pem_file=dict(), pem_file=dict(type='path'),
credentials_file=dict(), credentials_file=dict(type='path'),
project_id=dict(), ), ) project_id=dict(), ), )
if not HAS_PYTHON26: if not HAS_PYTHON26:

@ -193,8 +193,8 @@ def main():
members = dict(type='list'), members = dict(type='list'),
state = dict(default='present'), state = dict(default='present'),
service_account_email = dict(), service_account_email = dict(),
pem_file = dict(), pem_file = dict(type='path'),
credentials_file = dict(), credentials_file = dict(type='path'),
project_id = dict(), project_id = dict(),
) )
) )

@ -721,8 +721,8 @@ def main():
named_ports=dict(type='list', default=None), named_ports=dict(type='list', default=None),
service_account_email=dict(), service_account_email=dict(),
service_account_permissions=dict(type='list'), service_account_permissions=dict(type='list'),
pem_file=dict(), pem_file=dict(type='path'),
credentials_file=dict(), credentials_file=dict(type='path'),
project_id=dict(), ), ) project_id=dict(), ), )
if not HAS_PYTHON26: if not HAS_PYTHON26:

@ -329,8 +329,8 @@ def main():
target_tags = dict(type='list'), target_tags = dict(type='list'),
state = dict(default='present'), state = dict(default='present'),
service_account_email = dict(), service_account_email = dict(),
pem_file = dict(), pem_file = dict(type='path'),
credentials_file = dict(), credentials_file = dict(type='path'),
project_id = dict(), project_id = dict(),
mode = dict(default='legacy', choices=['legacy', 'auto', 'custom']), mode = dict(default='legacy', choices=['legacy', 'auto', 'custom']),
subnet_name = dict(), subnet_name = dict(),

@ -176,8 +176,8 @@ def main():
state = dict(default='present'), state = dict(default='present'),
zone = dict(default='us-central1-b'), zone = dict(default='us-central1-b'),
service_account_email = dict(), service_account_email = dict(),
pem_file = dict(), pem_file = dict(type='path'),
credentials_file = dict(), credentials_file = dict(type='path'),
project_id = dict(), project_id = dict(),
) )
) )

Loading…
Cancel
Save