Skip to content

Commit 5677846

Browse files
committed
removes fallback for host/vm role assignment 'Server' bb-Ricardo#299
1 parent d9606af commit 5677846

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

module/sources/vmware/connection.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1058,13 +1058,13 @@ def add_device_vm_to_inventory(self, object_type, object_data, pnic_data=None, v
10581058
# update role according to config settings
10591059
object_name = object_data.get(object_type.primary_key)
10601060
role_name = self.get_object_relation(object_name,
1061-
"host_role_relation" if object_type == NBDevice else "vm_role_relation",
1062-
fallback="Server")
1061+
"host_role_relation" if object_type == NBDevice else "vm_role_relation")
10631062

1064-
if object_type == NBDevice:
1065-
device_vm_object.update(data={"device_role": {"name": role_name}})
1066-
if object_type == NBVM:
1067-
device_vm_object.update(data={"role": {"name": role_name}})
1063+
if role_name is not None:
1064+
if object_type == NBDevice:
1065+
device_vm_object.update(data={"device_role": {"name": role_name}})
1066+
if object_type == NBVM:
1067+
device_vm_object.update(data={"role": {"name": role_name}})
10681068

10691069
# compile all nic data into one dictionary
10701070
if object_type == NBVM:

0 commit comments

Comments
 (0)