From 43334cea47f3cbd1839673a0187160119261fa10 Mon Sep 17 00:00:00 2001 From: Sharmin Choksey Date: Tue, 16 May 2017 19:58:26 -0700 Subject: [PATCH] Enables multiple roles for a given node Adds a feature to support more than one role type for a given node for node operations on controllers, compute and storage Change-Id: I2074ea6435c8f59a89b9439b8005896dcb1338cf --- cloudpulse/scenario/plugins/operator_tests/operator.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index 37aecc9..0782865 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -264,7 +264,8 @@ class operator_scenario(base.Scenario): for node in self.os_node_info_obj .get_host_list() - if node.role == "block_storage"] + if "block_storage" in + node.role.split()] if storage_nodes_from_ansible_config: cmd = (r"ceph -f json status") @@ -306,7 +307,7 @@ class operator_scenario(base.Scenario): nodes_from_ansible_config = [node.name.lower() for node in self.os_node_info_obj.get_host_list() - if node.role == "compute"] + if "compute" in node.role.split()] nova_hypervisor_list = self._get_nova_hypervior_list() if nova_hypervisor_list[0] != 200: return (404, ("Cannot get hypervisor list from "