From f557b54a474b837043738756016340931e7d02c2 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Tue, 3 Oct 2017 12:47:34 +0100 Subject: [PATCH] Deprecate Registry and it's config opts As per http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html deprecating also Glance Registry v2 and all related config options. Implements: https://blueprints.launchpad.net/glance/+spec/deprecate-registry Change-Id: Ic06ebdc250c00e7391ec6fbb48c84dd9827aeb22 --- glance/common/config.py | 16 ++++++++++ glance/registry/__init__.py | 16 ++++++++++ glance/registry/api/__init__.py | 3 ++ glance/registry/client/__init__.py | 48 ++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) diff --git a/glance/common/config.py b/glance/common/config.py index 5e4eb3cefd..487b78b265 100644 --- a/glance/common/config.py +++ b/glance/common/config.py @@ -249,6 +249,14 @@ Related options: # glance/tests/functional/v2/test_images.py cfg.StrOpt('data_api', default='glance.db.sqlalchemy.api', + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Python module path of data access API. @@ -558,6 +566,14 @@ Related options: """)), cfg.BoolOpt('enable_v2_registry', default=True, + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Deploy the v2 API Registry service. diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py index 06fbe00c42..e7bcfbcee4 100644 --- a/glance/registry/__init__.py +++ b/glance/registry/__init__.py @@ -25,6 +25,14 @@ from glance.i18n import _ registry_addr_opts = [ cfg.HostAddressOpt('registry_host', default='0.0.0.0', + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Address the registry server is hosted on. @@ -36,6 +44,14 @@ Related options: """)), cfg.PortOpt('registry_port', default=9191, + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Port the registry server is listening on. diff --git a/glance/registry/api/__init__.py b/glance/registry/api/__init__.py index 1237498599..b1ee6c4bb1 100644 --- a/glance/registry/api/__init__.py +++ b/glance/registry/api/__init__.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import debtcollector from oslo_config import cfg from glance.common import wsgi @@ -32,6 +33,8 @@ class API(wsgi.Router): if CONF.enable_v1_registry: v1.init(mapper) if CONF.enable_v2_registry: + debtcollector.deprecate("Glance Registry service has been " + "deprecated for removal.") v2.init(mapper) super(API, self).__init__(mapper) diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py index 6dc5fca748..d8ccece0fc 100644 --- a/glance/registry/client/__init__.py +++ b/glance/registry/client/__init__.py @@ -22,6 +22,14 @@ registry_client_opts = [ cfg.StrOpt('registry_client_protocol', default='http', choices=('http', 'https'), + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Protocol to use for communication with the registry server. @@ -48,6 +56,14 @@ Related options: """)), cfg.StrOpt('registry_client_key_file', sample_default='/etc/ssl/key/key-file.pem', + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Absolute path to the private key file. @@ -69,6 +85,14 @@ Related options: """)), cfg.StrOpt('registry_client_cert_file', sample_default='/etc/ssl/certs/file.crt', + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Absolute path to the certificate file. @@ -91,6 +115,14 @@ Related options: """)), cfg.StrOpt('registry_client_ca_file', sample_default='/etc/ssl/cafile/file.ca', + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Absolute path to the Certificate Authority file. @@ -115,6 +147,14 @@ Related options: """)), cfg.BoolOpt('registry_client_insecure', default=False, + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Set verification of the registry server certificate. @@ -140,6 +180,14 @@ Related options: cfg.IntOpt('registry_client_timeout', default=600, min=0, + deprecated_for_removal=True, + deprecated_since="Queens", + deprecated_reason=_(""" +Glance registry service is deprecated for removal. + +More information can be found from the spec: +http://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html +"""), help=_(""" Timeout value for registry requests.