From be87cd8c265391bbc8c482e7aaaa7bc8477a6355 Mon Sep 17 00:00:00 2001 From: camradal Date: Thu, 5 May 2016 06:48:54 -0700 Subject: [PATCH] Fix logging into vCloud Director and expose verify_certs argument (#15533) --- lib/ansible/module_utils/vca.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/vca.py b/lib/ansible/module_utils/vca.py index 92e51183d35..e895d28a7d9 100644 --- a/lib/ansible/module_utils/vca.py +++ b/lib/ansible/module_utils/vca.py @@ -46,7 +46,8 @@ def vca_argument_spec(): api_version=dict(default=DEFAULT_VERSION), service_type=dict(default=DEFAULT_SERVICE_TYPE, choices=SERVICE_MAP.keys()), vdc_name=dict(), - gateway_name=dict(default='gateway') + gateway_name=dict(default='gateway'), + verify_certs=dict(type='bool', default=True) ) class VcaAnsibleModule(AnsibleModule): @@ -130,7 +131,11 @@ class VcaAnsibleModule(AnsibleModule): service_type = self.params['service_type'] password = self.params['password'] - if not self.vca.login(password=password): + login_org = None + if service_type == 'vcd': + login_org = self.params['org'] + + if not self.vca.login(password=password, org=login_org): self.fail('Login to VCA failed', response=self.vca.response.content) try: