wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reference instance_id in docs, fixes for calls to fail_json

Browse source
This commit is contained in:
Charles Paul 2015-10-12 08:35:21 -05:00 committed by Matt Clay
parent 15ac8e9141
commit 3913de1c43
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/extras/cloud/vmware/vca_fw.py
View file

@ -41,10 +41,9 @@ options:
- The org to login to for creating vapp, mostly set when the service_type is vdc. - The org to login to for creating vapp, mostly set when the service_type is vdc.
required: false required: false
default: None default: None
service_id: instance_id:
version_added: "2.0"
description: description:
- The service id in a vchs environment to be used for creating the vapp - The instance id in a vchs environment to be used for creating the vapp
required: false required: false
default: None default: None
host: host:
@ -250,7 +249,7 @@ def main():
try: try:
desired_rules = validate_fw_rules(fw_rules) desired_rules = validate_fw_rules(fw_rules)
except VcaError, e: except VcaError, e:
module.fail_json(e.message) module.fail_json(msg=e.message)
result = dict(changed=False) result = dict(changed=False)
result['current_rules'] = current_rules result['current_rules'] = current_rules

6
lib/ansible/modules/extras/cloud/vmware/vca_nat.py
View file

@ -42,9 +42,9 @@ options:
- The org to login to for creating vapp, mostly set when the service_type is vdc. - The org to login to for creating vapp, mostly set when the service_type is vdc.
required: false required: false
default: None default: None
service_id: instance_id:
description: description:
- The service id in a vchs environment to be used for creating the vapp - The instance id in a vchs environment to be used for creating the vapp
required: false required: false
default: None default: None
host: host:
@ -200,7 +200,7 @@ def main():
purge_rules = module.params['purge_rules'] purge_rules = module.params['purge_rules']
if not purge_rules and not nat_rules: if not purge_rules and not nat_rules:
module.fail_json('Must define purge_rules or nat_rules') module.fail_json(msg='Must define purge_rules or nat_rules')
vca = vca_login(module) vca = vca_login(module)

9
lib/ansible/modules/extras/cloud/vmware/vca_vapp.py
View file

@ -104,15 +104,10 @@ options:
- The org to login to for creating vapp, mostly set when the service_type is vdc. - The org to login to for creating vapp, mostly set when the service_type is vdc.
required: false required: false
default: None default: None
service_id:
description:
- The service id in a vchs environment to be used for creating the vapp
required: false
default: None
instance_id: instance_id:
description: description:
- The vCloud Air instance ID - The instance id in a vchs environment to be used for creating the vapp
required: no required: false
default: None default: None
host: host:
description: description: