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

[Backport 2.7] VMware: Fix KeyError in vmware_host_config_manager

Browse source
This commit is contained in:
Mario Lenz 2019-02-26 21:46:03 +01:00 committed by Toshio Kuratomi
parent 88106ce626
commit 2aa96cdec5
2 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/44561-vmware_host_config_manager-fix_key_error.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fixed KeyError issue in vmware_host_config_manager when a supported option isn't already set (https://github.com/ansible/ansible/issues/44561).

18
lib/ansible/modules/cloud/vmware/vmware_host_config_manager.py
View file

@ -127,20 +127,18 @@ class VmwareConfigManager(PyVmomi):
for host in self.hosts:
option_manager = host.configManager.advancedOption
host_facts = {}
for option in option_manager.QueryOptions():
host_facts[option.key] = dict(value=option.value)
for s_option in option_manager.supportedOption:
host_facts[s_option.key].update(
option_type=s_option.optionType,
host_facts[s_option.key] = dict(option_type=s_option.optionType, value=None)
for option in option_manager.QueryOptions():
if option.key in host_facts:
host_facts[option.key].update(
value=option.value,
)
change_option_list = []
for option_key, option_value in self.options.items():
if option_key in host_facts:
# Make sure option_type is defined some values do not have
# it defined and appear to be read only.
if 'option_type' in host_facts[option_key]:
# We handle all supported types here so we can give meaningful errors.
option_type = host_facts[option_key]['option_type']
if self.is_boolean(option_value) and isinstance(option_type, vim.option.BoolOption):
@ -158,14 +156,12 @@ class VmwareConfigManager(PyVmomi):
else:
self.module.fail_json(msg="Provided value is of type %s."
" Option %s expects: %s" % (type(option_value), option_key, type(option_type)))
else:
self.module.fail_json(msg="Cannot change read only option %s to %s." % (option_key, option_value))
if option_value != host_facts[option_key]['value']:
change_option_list.append(vim.option.OptionValue(key=option_key, value=option_value))
changed = True
else: # Don't silently drop unknown options. This prevents typos from falling through the cracks.
self.module.fail_json(msg="Unknown option %s" % option_key)
self.module.fail_json(msg="Unsupported option %s" % option_key)
if changed:
try:
option_manager.UpdateOptions(changedValue=change_option_list)