From 2dcd56041cc49772403645be484ee4850df5c211 Mon Sep 17 00:00:00 2001 From: Pranali Deore Date: Tue, 18 Dec 2018 10:59:41 +0530 Subject: [PATCH] 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 --- .../glance-registry-disabled-puppet.yaml | 57 ------------------- overcloud-resource-registry-puppet.j2.yaml | 1 - ...bled-glance-registry-2738b41a2e200d95.yaml | 5 ++ roles/Controller.yaml | 1 - roles/ControllerAllNovaStandalone.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerOpenstack.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Standalone.yaml | 1 - roles_data.yaml | 1 - 11 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 deployment/glance/glance-registry-disabled-puppet.yaml create mode 100644 releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml diff --git a/deployment/glance/glance-registry-disabled-puppet.yaml b/deployment/glance/glance-registry-disabled-puppet.yaml deleted file mode 100644 index cd2c70f91a..0000000000 --- a/deployment/glance/glance-registry-disabled-puppet.yaml +++ /dev/null @@ -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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 85f8cc51d0..bcddb93e68 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/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 diff --git a/releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml b/releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml new file mode 100644 index 0000000000..96cace92e7 --- /dev/null +++ b/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. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 6b4c1da169..408b46ea21 100644 --- a/roles/Controller.yaml +++ b/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 diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 3f349b1c0d..6868b81053 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/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 diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 440af9e78f..0da87a9c07 100644 --- a/roles/ControllerNoCeph.yaml +++ b/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 diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 931d737242..f78505f5c1 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/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 diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 778844f091..196c9c7b2b 100644 --- a/roles/ControllerOpenstack.yaml +++ b/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 diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 9aca47845d..02663a52e5 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/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 diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index dcf3030532..ed7ef8cc80 100644 --- a/roles/Standalone.yaml +++ b/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 diff --git a/roles_data.yaml b/roles_data.yaml index 5de443726f..2a659ee895 100644 --- a/roles_data.yaml +++ b/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