Browse Source

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
changes/44/662844/3
Alex Schultz 3 years ago
parent
commit
67f8a42a85
  1. 45
      deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml
  2. 3
      environments/services/tripleo-ui.yaml
  3. 1
      network/service_net_map.j2.yaml
  4. 1
      overcloud-resource-registry-puppet.j2.yaml
  5. 1
      roles/Undercloud.yaml
  6. 1
      roles_data_undercloud.yaml
  7. 2
      tools/yaml-validate.py

45
deployment/deprecated/tripleo-ui/tripleo-ui-container-puppet.yaml

@ -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

3
environments/services/tripleo-ui.yaml

@ -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

1
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') }}

1
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

1
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

1
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

2
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'
}

Loading…
Cancel
Save