Add support for networker nodes to assert_ovn_containers_running
Changes in some functions where default groups where only compute and controller - now all overcloud nodes are included Change-Id: I2259a7beb9c8b16d740317ff633c369735f0361d
This commit is contained in:
parent
3fef57a712
commit
8f9ab5e4d3
|
@ -26,6 +26,7 @@ find_openstack_node = _topology.find_openstack_node
|
||||||
get_default_openstack_topology_class = (
|
get_default_openstack_topology_class = (
|
||||||
_topology.get_default_openstack_topology_class)
|
_topology.get_default_openstack_topology_class)
|
||||||
list_openstack_nodes = _topology.list_openstack_nodes
|
list_openstack_nodes = _topology.list_openstack_nodes
|
||||||
|
list_openstack_node_groups = _topology.list_openstack_node_groups
|
||||||
OpenStackTopology = _topology.OpenStackTopology
|
OpenStackTopology = _topology.OpenStackTopology
|
||||||
OpenStackTopologyNode = _topology.OpenStackTopologyNode
|
OpenStackTopologyNode = _topology.OpenStackTopologyNode
|
||||||
set_default_openstack_topology_class = (
|
set_default_openstack_topology_class = (
|
||||||
|
|
|
@ -84,10 +84,7 @@ def list_containers(group=None):
|
||||||
if group:
|
if group:
|
||||||
openstack_nodes = topology.list_openstack_nodes(group=group)
|
openstack_nodes = topology.list_openstack_nodes(group=group)
|
||||||
else:
|
else:
|
||||||
openstack_controllers = topology.list_openstack_nodes(
|
openstack_nodes = topology.list_openstack_nodes(group='overcloud')
|
||||||
group='controller')
|
|
||||||
openstack_computes = topology.list_openstack_nodes(group='compute')
|
|
||||||
openstack_nodes = openstack_controllers + openstack_computes
|
|
||||||
|
|
||||||
for node in openstack_nodes:
|
for node in openstack_nodes:
|
||||||
ssh_client = node.ssh_client
|
ssh_client = node.ssh_client
|
||||||
|
@ -213,18 +210,20 @@ def ovn_used_on_overcloud():
|
||||||
def assert_ovn_containers_running():
|
def assert_ovn_containers_running():
|
||||||
# specific OVN verifications
|
# specific OVN verifications
|
||||||
if ovn_used_on_overcloud():
|
if ovn_used_on_overcloud():
|
||||||
# TODO: deployments with networker nodes are not supported
|
|
||||||
ovn_controller_containers = ['ovn_controller',
|
ovn_controller_containers = ['ovn_controller',
|
||||||
'ovn-dbs-bundle-{}-'.
|
'ovn-dbs-bundle-{}-'.
|
||||||
format(container_runtime_name)]
|
format(container_runtime_name)]
|
||||||
ovn_compute_containers = ['ovn_metadata_agent',
|
ovn_compute_containers = ['ovn_metadata_agent',
|
||||||
'ovn_controller']
|
'ovn_controller']
|
||||||
for group, group_containers in [('controller',
|
group_containers_list = [('controller', ovn_controller_containers),
|
||||||
ovn_controller_containers),
|
('compute', ovn_compute_containers)]
|
||||||
('compute',
|
if 'networker' in topology.list_openstack_node_groups():
|
||||||
ovn_compute_containers)]:
|
ovn_networker_containers = ['ovn_controller']
|
||||||
|
group_containers_list.append(('networker',
|
||||||
|
ovn_networker_containers))
|
||||||
|
for group, group_containers in group_containers_list:
|
||||||
assert_containers_running(group, group_containers, full_name=False)
|
assert_containers_running(group, group_containers, full_name=False)
|
||||||
LOG.info("Networking OVN containers verified")
|
LOG.info("Networking OVN containers verified in running state")
|
||||||
else:
|
else:
|
||||||
LOG.info("Networking OVN not configured")
|
LOG.info("Networking OVN not configured")
|
||||||
|
|
||||||
|
|
|
@ -70,10 +70,7 @@ def setup_tripleo_topology():
|
||||||
|
|
||||||
def get_ip_to_nodes_dict(openstack_nodes=None):
|
def get_ip_to_nodes_dict(openstack_nodes=None):
|
||||||
if not openstack_nodes:
|
if not openstack_nodes:
|
||||||
openstack_controllers = topology.list_openstack_nodes(
|
openstack_nodes = topology.list_openstack_nodes(group='overcloud')
|
||||||
group='controller')
|
|
||||||
openstack_computes = topology.list_openstack_nodes(group='compute')
|
|
||||||
openstack_nodes = openstack_controllers + openstack_computes
|
|
||||||
ip_to_nodes_dict = {str(node.public_ip): node.name for node in
|
ip_to_nodes_dict = {str(node.public_ip): node.name for node in
|
||||||
openstack_nodes}
|
openstack_nodes}
|
||||||
return ip_to_nodes_dict
|
return ip_to_nodes_dict
|
||||||
|
|
Loading…
Reference in New Issue