From 67f8a42a855ed76c75413fbb2e7fd28d360992d1 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 3 Jun 2019 13:53:39 -0600 Subject: [PATCH] Remove tripleo-ui references We've removed the contents from tripleo-ui. Let's cleanup the remaining tripleo-ui items. Depends-On: https://review.opendev.org/#/c/662873/ Closes-Bug: #1831478 Change-Id: Ic6c0e2d42781633f78cb0d70b265456e71579a51 --- .../tripleo-ui-container-puppet.yaml | 45 ------------------- environments/services/tripleo-ui.yaml | 3 -- network/service_net_map.j2.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - roles/Undercloud.yaml | 1 - roles_data_undercloud.yaml | 1 - tools/yaml-validate.py | 2 - 7 files changed, 54 deletions(-) delete mode 100644 deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml delete mode 100644 environments/services/tripleo-ui.yaml diff --git a/deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml b/deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml deleted file mode 100644 index 5fe3f26e19..0000000000 --- a/deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml +++ /dev/null @@ -1,45 +0,0 @@ -heat_template_version: rocky - -description: > - Openstack containerized TripleO UI service, disabled since Stein - -parameters: - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - -outputs: - role_data: - description: Role data for the disabled TripleO UI role. - value: - service_name: tripleo_ui - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - tripleo_ui diff --git a/environments/services/tripleo-ui.yaml b/environments/services/tripleo-ui.yaml deleted file mode 100644 index 322350e207..0000000000 --- a/environments/services/tripleo-ui.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# THIS SERVICE IS DEPRECATED AND WILL BE REMOVED IN TRAIN CYCLE. -resource_registry: - OS::TripleO::Services::TripleoUI: ../../deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index e824cc9dc8..27319f5735 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -88,7 +88,6 @@ parameters: DockerRegistryNetwork: ctlplane PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} PacemakerRemoteNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - TripleoUINetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} DesignateApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} BINDNetwork: {{ _service_nets.get('external', 'ctlplane') }} EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index e1bfb0236b..5c4d5e7d38 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -190,7 +190,6 @@ resource_registry: OS::TripleO::Services::Memcached: deployment/memcached/memcached-container-puppet.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - OS::TripleO::Services::TripleoUI: OS::Heat::None OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-ansible.yaml OS::TripleO::Services::Securetty: OS::Heat::None # TODO(aschultz): Remove this in U as we switched to a task in the deploy diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 113a83015f..e461bd8b2f 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -90,7 +90,6 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::Tmpwatch - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::TripleoUI - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index dd98d0eca0..0b369c830b 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -93,7 +93,6 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::Tmpwatch - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::TripleoUI - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 918537dfaa..372db47d11 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -145,7 +145,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description', 'PlacementLoggingSource': ['default'], 'SaharaApiLoggingSource': ['default'], 'SaharaEngineLoggingSource': ['default'], - 'TripleoUILoggingSource': ['default'], # There's one template that defines this # differently, and I'm not sure if we can # safely change it. @@ -212,7 +211,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description', PREFERRED_CAMEL_CASE = { 'ec2api': 'Ec2Api', 'haproxy': 'HAProxy', - 'tripleo-ui': 'TripleoUI', 'metrics-qdr': 'MetricsQdr' }