diff options
| author | Harald Albers <albers@users.noreply.github.com> | 2019-11-12 04:01:07 +0100 |
|---|---|---|
| committer | Matt Davis <nitzmahone@users.noreply.github.com> | 2019-11-11 19:01:07 -0800 |
| commit | 85cb406753fba6afbc1c48ffd3cab9f81b211079 (patch) | |
| tree | f1ca70a4768cf7144640bd2264e3e92cdbd2ce70 | |
| parent | 1855494378db128fe0759f31eda85604955b7d3f (diff) | |
| download | ansible-85cb406753fba6afbc1c48ffd3cab9f81b211079.tar.gz | |
Backport #59614 to stable-2.8 (#64011)
* VMware: Fix Service Content calls in vmware_deploy_ovf
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
* add changelog
| -rw-r--r-- | changelogs/fragments/64011_vmware_deploy_ovf.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/cloud/vmware/vmware_deploy_ovf.py | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/changelogs/fragments/64011_vmware_deploy_ovf.yml b/changelogs/fragments/64011_vmware_deploy_ovf.yml new file mode 100644 index 0000000000..e970211e34 --- /dev/null +++ b/changelogs/fragments/64011_vmware_deploy_ovf.yml @@ -0,0 +1,2 @@ +bugfixes: +- vmware_deploy_ovf - backport content fix from 2.9 (https://github.com/ansible/ansible/pull/59614) diff --git a/lib/ansible/modules/cloud/vmware/vmware_deploy_ovf.py b/lib/ansible/modules/cloud/vmware/vmware_deploy_ovf.py index d60a0df56c..b542df6e35 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_deploy_ovf.py +++ b/lib/ansible/modules/cloud/vmware/vmware_deploy_ovf.py @@ -339,7 +339,7 @@ class VMwareDeployOvf(PyVmomi): self.module.fail_json(msg='%(resource_pool)s could not be located' % self.params) for key, value in self.params['networks'].items(): - network = find_network_by_name(self.si, value) + network = find_network_by_name(self.content, value) if not network: self.module.fail_json(msg='%(network)s could not be located' % self.params) network_mapping = vim.OvfManager.NetworkMapping() @@ -389,7 +389,7 @@ class VMwareDeployOvf(PyVmomi): params['propertyMapping'].append(property_mapping) if self.params['folder']: - folder = self.si.searchIndex.FindByInventoryPath(self.params['folder']) + folder = self.content.searchIndex.FindByInventoryPath(self.params['folder']) else: folder = datacenter.vmFolder @@ -397,7 +397,7 @@ class VMwareDeployOvf(PyVmomi): ovf_descriptor = self.get_ovf_descriptor() - self.import_spec = self.si.ovfManager.CreateImportSpec( + self.import_spec = self.content.ovfManager.CreateImportSpec( ovf_descriptor, resource_pool, datastore, @@ -419,9 +419,9 @@ class VMwareDeployOvf(PyVmomi): if not self.params['allow_duplicates']: name = self.import_spec.importSpec.configSpec.name - match = find_vm_by_name(self.si, name, folder=folder) + match = find_vm_by_name(self.content, name, folder=folder) if match: - self.module.exit_json(instance=gather_vm_facts(self.si, match), changed=False) + self.module.exit_json(instance=gather_vm_facts(self.content, match), changed=False) if self.module.check_mode: self.module.exit_json(changed=True, instance={'hw_name': name}) @@ -548,9 +548,9 @@ class VMwareDeployOvf(PyVmomi): env = ET.Element('Environment', **attrib) platform = ET.SubElement(env, 'PlatformSection') - ET.SubElement(platform, 'Kind').text = self.si.about.name - ET.SubElement(platform, 'Version').text = self.si.about.version - ET.SubElement(platform, 'Vendor').text = self.si.about.vendor + ET.SubElement(platform, 'Kind').text = self.content.about.name + ET.SubElement(platform, 'Version').text = self.content.about.version + ET.SubElement(platform, 'Vendor').text = self.content.about.vendor ET.SubElement(platform, 'Locale').text = 'US' prop_section = ET.SubElement(env, 'PropertySection') @@ -582,13 +582,13 @@ class VMwareDeployOvf(PyVmomi): if self.params['wait']: wait_for_task(task) if self.params['wait_for_ip_address']: - _facts = wait_for_vm_ip(self.si, self.entity) + _facts = wait_for_vm_ip(self.content, self.entity) if not _facts: self.module.fail_json(msg='Waiting for IP address timed out') facts.update(_facts) if not facts: - facts.update(gather_vm_facts(self.si, self.entity)) + facts.update(gather_vm_facts(self.content, self.entity)) return facts |