disable osp13 docker api common container checks
This functionality is not getting real names in docker api Change-Id: I1b0a1fc26c48d519ea7c07d81a2c71b99f71ec92
This commit is contained in:
parent
08282928d6
commit
306f8b3275
|
@ -202,6 +202,10 @@ def assert_containers_running(group, expected_containers, full_name=True):
|
||||||
"""assert that all containers specified in the list are running
|
"""assert that all containers specified in the list are running
|
||||||
on the specified openstack group(controller or compute etc..)"""
|
on the specified openstack group(controller or compute etc..)"""
|
||||||
|
|
||||||
|
if is_docker():
|
||||||
|
LOG.info('not checking common containers since we are on docker')
|
||||||
|
return
|
||||||
|
|
||||||
failures = []
|
failures = []
|
||||||
|
|
||||||
openstack_nodes = topology.list_openstack_nodes(group=group)
|
openstack_nodes = topology.list_openstack_nodes(group=group)
|
||||||
|
@ -300,12 +304,12 @@ def assert_all_tripleo_containers_running():
|
||||||
|
|
||||||
|
|
||||||
def osp13_container_name_short_format(container_name_long_format):
|
def osp13_container_name_short_format(container_name_long_format):
|
||||||
"""This takes a long format container name :
|
"""This takes a long format container name :
|
||||||
'rhosp13/openstack-neutron-l3-agent'
|
'rhosp13/openstack-neutron-l3-agent'
|
||||||
and turns it into : neutron_l3_agent
|
and turns it into : neutron_l3_agent
|
||||||
"""
|
"""
|
||||||
return re.sub('-', '_', re.sub('rhosp13/openstack-', ''
|
return re.sub('-', '_', re.sub('rhosp13/openstack-', '',
|
||||||
, container_name_long_format))
|
container_name_long_format))
|
||||||
|
|
||||||
|
|
||||||
def assert_ovn_containers_running():
|
def assert_ovn_containers_running():
|
||||||
|
|
Loading…
Reference in New Issue