diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index e80e8dd565..a3f05b1401 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -2275,7 +2275,7 @@ class vmware(PluginFileInjector): "customValue", # optional "datastore", "effectiveRole", - "guestHeartbeatStatus", # optonal + "guestHeartbeatStatus", # optional "layout", # optional "layoutEx", # optional "name", @@ -2287,7 +2287,6 @@ class vmware(PluginFileInjector): "resourcePool", "rootSnapshot", "snapshot", # optional - "tag", "triggeredAlarmState", "value" ] @@ -2356,7 +2355,7 @@ class vmware(PluginFileInjector): }) else: # default groups from script - for entry in ('guest.guestId', '"templates" if config.template else "guests"'): + for entry in ('config.guestId', '"templates" if config.template else "guests"'): ret['keyed_groups'].append({ 'prefix': '', 'separator': '', 'key': entry diff --git a/awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml b/awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml index d08a5ff126..ac1db9f4cf 100644 --- a/awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml +++ b/awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml @@ -43,7 +43,6 @@ properties: - resourcePool - rootSnapshot - snapshot -- tag - triggeredAlarmState - value - capability