Remove Glance Registry service

Glance registry is not required for the v2 of the API and there are
plans to deprecate it in the glance community.

Let's remove v1 support since it has been deprecated for a while in
Glance.

Depends-On: I77db1e1789fba0fb8ac014d6d1f8f5a8ae98ae84
Co-Authored: Flavio Percoco <flaper87@gmail.com>
Change-Id: I0cd722e8c5a43fd19336e23a7fada71c257a8e2d

3 files changed, 2 insertions, 117 deletions

diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 0a7c90e1..6d01bd48 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -80,12 +80,8 @@ outputs:
             glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
             glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
             glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
-            glance::api::registry_host:
-              str_replace:
-                template: "'REGISTRY_HOST'"
-                params:
-                  REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
-            glance::api::registry_client_protocol: {get_param: [EndpointMap, GlanceRegistryInternal, protocol] }
+            glance::api::enable_v1_api: false
+            glance::api::enable_v2_api: true
             glance::api::authtoken::password: {get_param: GlancePassword}
             glance::api::enable_proxy_headers_parsing: true
             glance::api::debug: {get_param: Debug}
diff --git a/puppet/services/glance-base.yaml b/puppet/services/glance-base.yaml
index d715ac02..f5548982 100644
--- a/puppet/services/glance-base.yaml
+++ b/puppet/services/glance-base.yaml
@@ -105,8 +105,6 @@ outputs:
         glance::notify::rabbitmq::rabbit_password: {get_param: RabbitPassword}
         glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         glance::notify::rabbitmq::notification_driver: messagingv2
-        glance::registry::db::database_db_max_retries: -1
-        glance::registry::db::database_max_retries: -1
         tripleo::profile::base::glance::api::glance_nfs_enabled: {get_param: GlanceNfsEnabled}
         tripleo::glance::nfs_mount::share: {get_param: GlanceNfsShare}
         tripleo::glance::nfs_mount::options: {get_param: GlanceNfsOptions}
diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
deleted file mode 100644
index 914c1584..00000000
--- a/puppet/services/glance-registry.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-heat_template_version: ocata
-
-description: >
-  OpenStack Glance Registry service configured with Puppet
-
-parameters:
-  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
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  Debug:
-    default: ''
-    description: Set to True to enable debugging on all services.
-    type: string
-  GlancePassword:
-    description: The password for the glance service and db account, used by the glance services.
-    type: string
-    hidden: true
-  GlanceWorkers:
-    default: ''
-    description: |
-      Number of worker processes for glance registry. If left unset (empty
-      string), the default value will result in the configuration being left
-      unset and a system-dependent default value will be chosen (e.g.: number of
-      processors). Please note that this will create a large number of processes
-      on systems with a large number of CPUs resulting in excess memory
-      consumption. It is recommended that a suitable non-default value be
-      selected on such systems.
-    type: string
-  MonitoringSubscriptionGlanceRegistry:
-    default: 'overcloud-glance-registry'
-    type: string
-  GlanceRegistryLoggingSource:
-    type: json
-    default:
-      tag: openstack.glance.registry
-      path: /var/log/glance/registry.log
-
-resources:
-  GlanceBase:
-    type: ./glance-base.yaml
-    properties:
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-
-outputs:
-  role_data:
-    description: Role data for the Glance Registry role.
-    value:
-      service_name: glance_registry
-      monitoring_subscription: {get_param: MonitoringSubscriptionGlanceRegistry}
-      logging_source: {get_param: GlanceRegistryLoggingSource}
-      logging_groups:
-        - glance
-      config_settings:
-        map_merge:
-          - get_attr: [GlanceBase, role_data, config_settings]
-
-          - glance::registry::database_connection:
-              list_join:
-                - ''
-                - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-                  - '://glance:'
-                  - {get_param: GlancePassword}
-                  - '@'
-                  - {get_param: [EndpointMap, MysqlInternal, host]}
-                  - '/glance'
-                  - '?bind_address='
-                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
-            glance::registry::authtoken::password: {get_param: GlancePassword}
-            glance::registry::authtoken::project_name: 'service'
-            glance::registry::pipeline: 'keystone'
-            glance::registry::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-            glance::registry::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
-            glance::registry::debug: {get_param: Debug}
-            glance::registry::workers: {get_param: GlanceWorkers}
-            tripleo.glance_registry.firewall_rules:
-              '112 glance_registry':
-                dport:
-                  - 9191
-            # NOTE: bind IP is found in Heat replacing the network name with the
-            # local node IP for the given network; replacement examples
-            # (eg. for internal_api):
-            # internal_api -> IP
-            # internal_api_uri -> [IP]
-            # internal_api_subnet - > IP/CIDR
-            glance::registry::bind_host: {get_param: [ServiceNetMap, GlanceRegistryNetwork]}
-      step_config: |
-        include ::tripleo::profile::base::glance::registry
-      service_config_settings:
-          get_attr: [GlanceBase, role_data, config_settings]
-      upgrade_tasks:
-        - name: Stop glance_registry service
-          tags: step2
-          service: name=openstack-glance-registry state=stopped
-        - name: Start glance_registry service
-          tags: step6
-          service: name=openstack-glance-registry state=started