diff options
| author | aperigault <aperigault@users.noreply.github.com> | 2017-01-18 11:52:51 +0100 |
|---|---|---|
| committer | John R Barker <john@johnrbarker.com> | 2017-01-18 10:52:51 +0000 |
| commit | e9704b389b6dfabd38bafb64a6befb499db59ff9 (patch) | |
| tree | 4452e712e6aeab37400e99425639d409d85d5af5 | |
| parent | b2a16379c8628a9d0c7dacfd3ec6de3e358318d7 (diff) | |
| download | ansible-e9704b389b6dfabd38bafb64a6befb499db59ff9.tar.gz | |
vmware_guest: Fix windows joindomain customization (#20303)
| -rw-r--r-- | lib/ansible/modules/cloud/vmware/vmware_guest.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest.py b/lib/ansible/modules/cloud/vmware/vmware_guest.py index 4a1d316e98..099f6b7b9d 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest.py @@ -1062,10 +1062,15 @@ class PyVmomiHelper(object): ident.userData.orgName = str(self.params['customization']['productid']) if 'joindomain' in self.params['customization']: - # TODO: Escalate if domainAdmin and domainPassword are not provided + if 'domainadmin' not in self.params['customization'] or 'domainadminpassword' not in self.params['customization']: + self.module.fail_json(msg="'domainadmin' and 'domainadminpassword' entries are mandatory in 'customization' section to use joindomain feature") + ident.identification.domainAdmin = str(self.params['customization'].get('domainadmin')) - ident.identification.domainAdminPassword = str(self.params['customization'].get('domainadminpassword')) ident.identification.joinDomain = str(self.params['customization'].get('joindomain')) + ident.identification.domainAdminPassword = vim.vm.customization.Password() + ident.identification.domainAdminPassword.value = str(self.params['customization'].get('domainadminpassword')) + ident.identification.domainAdminPassword.plainText = True + elif 'joinworkgroup' in self.params['customization']: ident.identification.joinWorkgroup = str(self.params['customization'].get('joinworkgroup')) |