From 75defc10fa138776076ef6a8ca53d281aaea338d Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 3 Jun 2019 17:10:41 -0600 Subject: [PATCH] Remove tripleo-ui items from the undercloud install We've retired the tripleo-ui repository so we need to remove the ui configurations for the undercloud. Change-Id: I536b2cf361cc4b2e47332bb9842d85ffe0643a60 Related-Bug: #1831478 --- .../remove-tripleo-ui-0176ef82f8563b92.yaml | 4 ++++ tripleoclient/config/standalone.py | 5 ----- .../tests/config/test_config_standalone.py | 3 --- .../tests/config/test_config_undercloud.py | 2 -- .../v1/undercloud/test_install_upgrade.py | 21 ------------------- tripleoclient/v1/undercloud_config.py | 4 ---- tripleoclient/v1/undercloud_preflight.py | 9 ++------ 7 files changed, 6 insertions(+), 42 deletions(-) create mode 100644 releasenotes/notes/remove-tripleo-ui-0176ef82f8563b92.yaml diff --git a/releasenotes/notes/remove-tripleo-ui-0176ef82f8563b92.yaml b/releasenotes/notes/remove-tripleo-ui-0176ef82f8563b92.yaml new file mode 100644 index 000000000..4db86a7a4 --- /dev/null +++ b/releasenotes/notes/remove-tripleo-ui-0176ef82f8563b92.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + `enable_ui` has been removed from the undercloud configuration options. diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py index dd430328a..7902ceb1d 100644 --- a/tripleoclient/config/standalone.py +++ b/tripleoclient/config/standalone.py @@ -89,11 +89,6 @@ class StandaloneConfig(BaseConfig): '(ceilometer, gnocchi, aodh, panko ) in the ' 'Undercloud.') ), - cfg.BoolOpt('enable_ui', - default=tripleo_ui, - deprecated_for_removal=True, - help=_('Whether to install the TripleO UI.') - ), cfg.BoolOpt('enable_validations', default=validations, help=_( diff --git a/tripleoclient/tests/config/test_config_standalone.py b/tripleoclient/tests/config/test_config_standalone.py index 0b8585dfe..972509778 100644 --- a/tripleoclient/tests/config/test_config_standalone.py +++ b/tripleoclient/tests/config/test_config_standalone.py @@ -51,7 +51,6 @@ class TestStandaloneConfig(base.TestCase): 'enable_novajoin', 'enable_telemetry', 'enable_tempest', - 'enable_ui', 'enable_validations', 'enable_zaqar'] self.assertEqual(expected, [x.name for x in ret]) @@ -76,7 +75,6 @@ class TestStandaloneConfig(base.TestCase): 'enable_novajoin', 'enable_telemetry', 'enable_tempest', - 'enable_ui', 'enable_validations', 'enable_zaqar'] self.assertEqual(expected, [x.name for x in ret]) @@ -99,7 +97,6 @@ class TestStandaloneConfig(base.TestCase): 'enable_novajoin', 'enable_telemetry', 'enable_tempest', - 'enable_ui', 'enable_validations', 'enable_zaqar', 'heat_container_image', diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py index f140c99d9..36f3c8666 100644 --- a/tripleoclient/tests/config/test_config_undercloud.py +++ b/tripleoclient/tests/config/test_config_undercloud.py @@ -103,7 +103,6 @@ class TestUndercloudConfig(base.TestCase): 'enable_swift_encryption', 'enable_telemetry', 'enable_tempest', - 'enable_ui', 'enable_validations', 'enable_zaqar', 'enabled_hardware_types', @@ -168,7 +167,6 @@ class TestUndercloudConfig(base.TestCase): 'enable_novajoin': False, 'enable_telemetry': False, 'enable_tempest': True, - 'enable_ui': True, 'enable_validations': True, 'enable_zaqar': True} self.assertEqual(sorted(expected.keys()), [x.name for x in ret]) diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py index 775b009d9..a284441c2 100644 --- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py +++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py @@ -95,8 +95,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -159,7 +157,6 @@ class TestUndercloudInstall(TestPluginV1): '/usertht/environments/services/ironic-inspector.yaml', '-e', '/usertht/environments/services/mistral.yaml', '-e', '/usertht/environments/services/zaqar-swift-backend.yaml', '-e', - '/usertht/environments/services/tripleo-ui.yaml', '-e', '/usertht/environments/services/tempest.yaml', '-e', '/usertht/environments/public-tls-undercloud.yaml', '--public-virtual-ip', '192.168.24.2', @@ -323,8 +320,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -392,8 +387,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -457,8 +450,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -519,8 +510,6 @@ class TestUndercloudInstall(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/barbican.yaml', '-e', @@ -605,8 +594,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -670,8 +657,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -734,8 +719,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -798,8 +781,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', @@ -866,8 +847,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/zaqar-swift-backend.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' - 'services/tripleo-ui.yaml', '-e', - '/usr/share/openstack-tripleo-heat-templates/environments/' 'services/tempest.yaml', '-e', '/usr/share/openstack-tripleo-heat-templates/environments/' 'public-tls-undercloud.yaml', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 06fc7ff9a..3d83b6a44 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -534,10 +534,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False, for env_file in TELEMETRY_DOCKER_ENV_YAML: deploy_args += ['-e', os.path.join(tht_templates, env_file)] - if CONF.get('enable_ui'): - deploy_args += ['-e', os.path.join( - tht_templates, "environments/services/tripleo-ui.yaml")] - if CONF.get('enable_cinder'): deploy_args += ['-e', os.path.join( tht_templates, diff --git a/tripleoclient/v1/undercloud_preflight.py b/tripleoclient/v1/undercloud_preflight.py index 3434c3704..35da3cc91 100644 --- a/tripleoclient/v1/undercloud_preflight.py +++ b/tripleoclient/v1/undercloud_preflight.py @@ -232,13 +232,8 @@ def _validate_in_cidr(subnet_props, subnet_name): if subnet_name == CONF.local_subnet: validate_addr_in_cidr(str(netaddr.IPNetwork(CONF.local_ip).ip), 'local_ip') - # NOTE(bnemec): The ui needs to be externally accessible, which means - # in many cases we can't have the public vip on the provisioning - # network. In that case users are on their own to ensure they've picked - # valid values for the VIP hosts. - if ((CONF.undercloud_service_certificate or - CONF.generate_service_certificate) and - not CONF.enable_ui): + if (CONF.undercloud_service_certificate or + CONF.generate_service_certificate): validate_addr_in_cidr(CONF['undercloud_public_host'], 'undercloud_public_host', require_ip=False, log_only=True)