Browse Source

Remove all glance-registry related changes

Removed all glance-registry related changes from THT, since
Glance Registry has become redundant & been deprecated from
glance due to support of Glance V2. The registry code base is
also going to be removed from Glance project once all the
dependencies removed from other projects.

Change-Id: I548816e3f2d8b9deed8a6f0ba3e203f84ad3d9ca
Closes-Bug: #1808911
changes/89/625789/3
Pranali Deore 3 years ago
committed by Alex Schultz
parent
commit
2dcd56041c
  1. 57
      deployment/glance/glance-registry-disabled-puppet.yaml
  2. 1
      overcloud-resource-registry-puppet.j2.yaml
  3. 5
      releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml
  4. 1
      roles/Controller.yaml
  5. 1
      roles/ControllerAllNovaStandalone.yaml
  6. 1
      roles/ControllerNoCeph.yaml
  7. 1
      roles/ControllerNovaStandalone.yaml
  8. 1
      roles/ControllerOpenstack.yaml
  9. 1
      roles/ControllerStorageNfs.yaml
  10. 1
      roles/Standalone.yaml
  11. 1
      roles_data.yaml

57
deployment/glance/glance-registry-disabled-puppet.yaml

@ -1,57 +0,0 @@
heat_template_version: rocky
description: >
OpenStack Glance Registry service, disabled since ocata
parameters:
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
outputs:
role_data:
description: Role data for the disabled Glance Registry role.
value:
service_name: glance_registry_disabled
upgrade_tasks: []
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
block:
- name: Check if glance_registry is deployed
command: systemctl is-enabled --quiet openstack-glance-registry
ignore_errors: True
register: glance_registry_enabled_result
- name: Set fact glance_registry_enabled
set_fact:
glance_registry_enabled: "{{ glance_registry_enabled_result.rc == 0 }}"
- name: Stop openstack-glance-registry
service: name=openstack-glance-registry state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- glance_registry_enabled|bool

1
overcloud-resource-registry-puppet.j2.yaml

@ -123,7 +123,6 @@ resource_registry:
OS::TripleO::Services::Congress: OS::Heat::None
OS::TripleO::Services::Keystone: deployment/keystone/keystone-container-puppet.yaml
OS::TripleO::Services::GlanceApi: deployment/glance/glance-api-container-puppet.yaml
OS::TripleO::Services::GlanceRegistry: deployment/glance/glance-registry-disabled-puppet.yaml
OS::TripleO::Services::HeatApi: deployment/heat/heat-api-container-puppet.yaml
OS::TripleO::Services::HeatApiCfn: deployment/heat/heat-api-cfn-container-puppet.yaml
OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml

5
releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml

@ -0,0 +1,5 @@
---
deprecations:
- |
Removed 'glance-registry' related changes since it's
been deprecated from glance & no longer been used.

1
roles/Controller.yaml

@ -85,7 +85,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/ControllerAllNovaStandalone.yaml

@ -60,7 +60,6 @@
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/ControllerNoCeph.yaml

@ -78,7 +78,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/ControllerNovaStandalone.yaml

@ -62,7 +62,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/ControllerOpenstack.yaml

@ -65,7 +65,6 @@
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/ControllerStorageNfs.yaml

@ -78,7 +78,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles/Standalone.yaml

@ -82,7 +82,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

1
roles_data.yaml

@ -88,7 +88,6 @@
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Fluentd
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd

Loading…
Cancel
Save