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

Enable path expansion in GCE modules

Browse source 
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`
This commit is contained in:
Johannes Kohnen 2017-03-10 11:31:18 +01:00 committed by Brian Coca
parent 0d0c38400f
commit cc2eecc247
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/google/gce_eip.py
View file

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

4
lib/ansible/modules/cloud/google/gce_lb.py
View file

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

4
lib/ansible/modules/cloud/google/gce_mig.py
View file

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

4
lib/ansible/modules/cloud/google/gce_net.py
View file

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

4
lib/ansible/modules/cloud/google/gce_pd.py
View file

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