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

vmware_guest: exclude dvswitch_name from guest os customization (#65997)

Browse source 
- exclude dvswitch_name from guest os customization
- add changelog fragment for ansible PR#65997
This commit is contained in:
njferrant 2020-01-06 16:41:02 -05:00 committed by Gonéri Le Bouder
parent 22855f73fb
commit bac2e02900
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/65997-vmware_guest-exclude-dvswitch-name-from-os-customization.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- vmware_guest - Exclude dvswitch_name from triggering guest os customization.

4
lib/ansible/modules/cloud/vmware/vmware_guest.py
View file

@ -2432,7 +2432,7 @@ class PyVmomiHelper(PyVmomi):
if key == 'type' and nw['type'] == 'dhcp': if key == 'type' and nw['type'] == 'dhcp':
network_changes = True network_changes = True
break break
if key not in ('device_type', 'mac', 'name', 'vlan', 'type', 'start_connected'): if key not in ('device_type', 'mac', 'name', 'vlan', 'type', 'start_connected', 'dvswitch_name'):
network_changes = True network_changes = True
break break
@ -2701,7 +2701,7 @@ class PyVmomiHelper(PyVmomi):
for nw in self.params['networks']: for nw in self.params['networks']:
for key in nw: for key in nw:
# We don't need customizations for these keys # We don't need customizations for these keys
if key not in ('device_type', 'mac', 'name', 'vlan', 'type', 'start_connected'): if key not in ('device_type', 'mac', 'name', 'vlan', 'type', 'start_connected', 'dvswitch_name'):
network_changes = True network_changes = True
break break
if len(self.params['customization']) > 1 or network_changes or self.params.get('customization_spec'): if len(self.params['customization']) > 1 or network_changes or self.params.get('customization_spec'):