openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Add container_cli used for the Overcloud to the Inventory"

This commit is contained in:
Zuul 2019-04-16 15:52:31 +00:00 committed by Gerrit Code Review
parent c7ffea0745 3153c449a2
commit 1a23039ca5
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tripleo_common/inventory.py
View File

@ -268,12 +268,18 @@ class TripleoInventory(object):
if children:
vip_map = self.stack_outputs.get('VipMap', {})
vips = {(vip_name + "_vip"): vip
for vip_name, vip in vip_map.items()
if vip and (vip_name in networks or vip_name == 'redis')}
overcloud_vars = {
(vip_name + "_vip"): vip for vip_name, vip in vip_map.items()
if vip and (vip_name in networks or vip_name == 'redis')
}
overcloud_vars['container_cli'] = \
self.get_overcloud_environment().get(
'parameter_defaults', {}).get('ContainerCli')
ret['overcloud'] = {
'children': self._hosts(sorted(children)),
'vars': vips
'vars': overcloud_vars
}
# Associate services with roles

8
tripleo_common/tests/test_inventory.py
View File

@ -104,7 +104,8 @@ class TestInventory(base.TestCase):
self.hclient = MagicMock()
self.hclient.stacks.environment.return_value = {
'parameter_defaults': {'AdminPassword': 'theadminpw'}}
'parameter_defaults': {'AdminPassword': 'theadminpw',
'ContainerCli': 'podman'}}
self.mock_stack = MagicMock()
self.mock_stack.outputs = self.outputs_data['outputs']
self.hclient.stacks.get.return_value = self.mock_stack
@ -195,6 +196,7 @@ class TestInventory(base.TestCase):
'overcloud': {
'children': ['Compute', 'Controller', 'CustomRole'],
'vars': {
'container_cli': 'podman',
'ctlplane_vip': 'x.x.x.4',
'redis_vip': 'x.x.x.6'}},
'Undercloud': {
@ -275,6 +277,7 @@ class TestInventory(base.TestCase):
'overcloud': {
'children': ['Compute', 'Controller', 'CustomRole'],
'vars': {
'container_cli': 'podman',
'ctlplane_vip': 'x.x.x.4',
'redis_vip': 'x.x.x.6'}},
'Undercloud': {
@ -366,7 +369,8 @@ class TestInventory(base.TestCase):
'overcloud': {'children': {'Compute': {},
'Controller': {},
'CustomRole': {}},
'vars': {'ctlplane_vip': 'x.x.x.4',
'vars': {'container_cli': 'podman',
'ctlplane_vip': 'x.x.x.4',
'redis_vip': 'x.x.x.6'}},
'sa': {'children': {'Controller': {}},
'vars': {'ansible_ssh_user': 'heat-admin'}},