From 8f87c8e3619bb0c1989a9acdf48f54646a408335 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Tue, 10 Apr 2018 09:30:45 +0200 Subject: [PATCH] Fix switching services-docker to services Change-Id: I1e264a03b10c1a5244e9a604c45c608c19037827 Signed-off-by: Bogdan Dobrelya --- tripleoclient/tests/v1/undercloud/test_undercloud.py | 4 ++-- tripleoclient/v1/undercloud_config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tripleoclient/tests/v1/undercloud/test_undercloud.py b/tripleoclient/tests/v1/undercloud/test_undercloud.py index 6e2b0ad0d..96c74dd7b 100644 --- a/tripleoclient/tests/v1/undercloud/test_undercloud.py +++ b/tripleoclient/tests/v1/undercloud/test_undercloud.py @@ -76,7 +76,7 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar.yaml', '-e', '/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/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', @@ -155,7 +155,7 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar.yaml', '-e', '/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/' 'public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 610404714..008140eb1 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -718,7 +718,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False): if CONF.get('enable_ui'): 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'): deploy_args += ['-e', os.path.join(