openstack
/
tripleo-common
Code Issues Proposed changes

Update the Undercloud Services list in the inventory. 

Since Stein, the name of the OpenStack services on the Undercloud have
been renamed as 'tripleo_*.service'. This patch makes the Undercloud
service names evolve accordingly.

Change-Id: I7c290f908fd685b801f49ba80531c14ce54677bd
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2019-06-14 14:27:12 +02:00
parent 11ac44b8ba
commit 6942ac007f
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/inventory.py
View File

@ -135,9 +135,9 @@ class TripleoInventory(object):
return {}
UNDERCLOUD_SERVICES = [
'openstack-nova-compute', 'openstack-heat-engine',
'openstack-ironic-conductor', 'openstack-swift-container',
'openstack-swift-object', 'openstack-mistral-engine']
'tripleo_nova_compute', 'tripleo_heat_engine',
'tripleo_ironic_conductor', 'tripleo_swift_container_server',
'tripleo_swift_object_server', 'tripleo_mistral_engine']
def get_undercloud_service_list(self):
"""Return list of undercloud services - currently static

36
tripleo_common/tests/test_inventory.py
View File

@ -218,12 +218,12 @@ class TestInventory(base.TestCase):
'plan': 'overcloud',
'project_name': 'admin',
'undercloud_service_list': [
'openstack-nova-compute',
'openstack-heat-engine',
'openstack-ironic-conductor',
'openstack-swift-container',
'openstack-swift-object',
'openstack-mistral-engine'],
'tripleo_nova_compute',
'tripleo_heat_engine',
'tripleo_ironic_conductor',
'tripleo_swift_container_server',
'tripleo_swift_object_server',
'tripleo_mistral_engine'],
'undercloud_swift_url': 'anendpoint',
'username': 'admin'}}}
inv_list = inventory.list()
@ -305,12 +305,12 @@ class TestInventory(base.TestCase):
'plan': 'overcloud',
'project_name': 'admin',
'undercloud_service_list': [
'openstack-nova-compute',
'openstack-heat-engine',
'openstack-ironic-conductor',
'openstack-swift-container',
'openstack-swift-object',
'openstack-mistral-engine'],
'tripleo_nova_compute',
'tripleo_heat_engine',
'tripleo_ironic_conductor',
'tripleo_swift_container_server',
'tripleo_swift_object_server',
'tripleo_mistral_engine'],
'undercloud_swift_url':
'anendpoint' if session else None,
'username': 'admin'}}}
@ -414,12 +414,12 @@ class TestInventory(base.TestCase):
'plan': 'overcloud',
'project_name': 'admin',
'undercloud_service_list': [
'openstack-nova-compute',
'openstack-heat-engine',
'openstack-ironic-conductor',
'openstack-swift-container',
'openstack-swift-object',
'openstack-mistral-engine'],
'tripleo_nova_compute',
'tripleo_heat_engine',
'tripleo_ironic_conductor',
'tripleo_swift_container_server',
'tripleo_swift_object_server',
'tripleo_mistral_engine'],
'undercloud_swift_url': 'anendpoint',
'username': 'admin'}}}
if extra_vars: