openstack/python-tripleoclient
Code Issues Proposed changes

Fix switching services-docker to services

Browse Source 
Change-Id: I1e264a03b10c1a5244e9a604c45c608c19037827
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2018-04-10 09:30:45 +02:00
parent 66c5d61ac8
commit 8f87c8e361
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -76,7 +76,7 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar.yaml', '-e', 'services/zaqar.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/tripleo-ui.yaml', '-e', 'services/tripleo-ui.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
@ -155,7 +155,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar.yaml', '-e', 'services/zaqar.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/tripleo-ui.yaml', '-e', 'services/tripleo-ui.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',

2
tripleoclient/v1/undercloud_config.py
View File

@ -718,7 +718,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
if CONF.get('enable_ui'): if CONF.get('enable_ui'):
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(
tht_templates, "environments/services-docker/tripleo-ui.yaml")] tht_templates, "environments/services/tripleo-ui.yaml")]
if CONF.get('enable_cinder'): if CONF.get('enable_cinder'):
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(