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
This commit is contained in:
parent
32f4e50fc7
commit
f557b54a47
|
@ -249,6 +249,14 @@ Related options:
|
||||||
# glance/tests/functional/v2/test_images.py
|
# glance/tests/functional/v2/test_images.py
|
||||||
cfg.StrOpt('data_api',
|
cfg.StrOpt('data_api',
|
||||||
default='glance.db.sqlalchemy.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=_("""
|
help=_("""
|
||||||
Python module path of data access API.
|
Python module path of data access API.
|
||||||
|
|
||||||
|
@ -558,6 +566,14 @@ Related options:
|
||||||
""")),
|
""")),
|
||||||
cfg.BoolOpt('enable_v2_registry',
|
cfg.BoolOpt('enable_v2_registry',
|
||||||
default=True,
|
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=_("""
|
help=_("""
|
||||||
Deploy the v2 API Registry service.
|
Deploy the v2 API Registry service.
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,14 @@ from glance.i18n import _
|
||||||
registry_addr_opts = [
|
registry_addr_opts = [
|
||||||
cfg.HostAddressOpt('registry_host',
|
cfg.HostAddressOpt('registry_host',
|
||||||
default='0.0.0.0',
|
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=_("""
|
help=_("""
|
||||||
Address the registry server is hosted on.
|
Address the registry server is hosted on.
|
||||||
|
|
||||||
|
@ -36,6 +44,14 @@ Related options:
|
||||||
|
|
||||||
""")),
|
""")),
|
||||||
cfg.PortOpt('registry_port', default=9191,
|
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=_("""
|
help=_("""
|
||||||
Port the registry server is listening on.
|
Port the registry server is listening on.
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import debtcollector
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from glance.common import wsgi
|
from glance.common import wsgi
|
||||||
|
@ -32,6 +33,8 @@ class API(wsgi.Router):
|
||||||
if CONF.enable_v1_registry:
|
if CONF.enable_v1_registry:
|
||||||
v1.init(mapper)
|
v1.init(mapper)
|
||||||
if CONF.enable_v2_registry:
|
if CONF.enable_v2_registry:
|
||||||
|
debtcollector.deprecate("Glance Registry service has been "
|
||||||
|
"deprecated for removal.")
|
||||||
v2.init(mapper)
|
v2.init(mapper)
|
||||||
|
|
||||||
super(API, self).__init__(mapper)
|
super(API, self).__init__(mapper)
|
||||||
|
|
|
@ -22,6 +22,14 @@ registry_client_opts = [
|
||||||
cfg.StrOpt('registry_client_protocol',
|
cfg.StrOpt('registry_client_protocol',
|
||||||
default='http',
|
default='http',
|
||||||
choices=('http', 'https'),
|
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=_("""
|
help=_("""
|
||||||
Protocol to use for communication with the registry server.
|
Protocol to use for communication with the registry server.
|
||||||
|
|
||||||
|
@ -48,6 +56,14 @@ Related options:
|
||||||
""")),
|
""")),
|
||||||
cfg.StrOpt('registry_client_key_file',
|
cfg.StrOpt('registry_client_key_file',
|
||||||
sample_default='/etc/ssl/key/key-file.pem',
|
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=_("""
|
help=_("""
|
||||||
Absolute path to the private key file.
|
Absolute path to the private key file.
|
||||||
|
|
||||||
|
@ -69,6 +85,14 @@ Related options:
|
||||||
""")),
|
""")),
|
||||||
cfg.StrOpt('registry_client_cert_file',
|
cfg.StrOpt('registry_client_cert_file',
|
||||||
sample_default='/etc/ssl/certs/file.crt',
|
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=_("""
|
help=_("""
|
||||||
Absolute path to the certificate file.
|
Absolute path to the certificate file.
|
||||||
|
|
||||||
|
@ -91,6 +115,14 @@ Related options:
|
||||||
""")),
|
""")),
|
||||||
cfg.StrOpt('registry_client_ca_file',
|
cfg.StrOpt('registry_client_ca_file',
|
||||||
sample_default='/etc/ssl/cafile/file.ca',
|
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=_("""
|
help=_("""
|
||||||
Absolute path to the Certificate Authority file.
|
Absolute path to the Certificate Authority file.
|
||||||
|
|
||||||
|
@ -115,6 +147,14 @@ Related options:
|
||||||
""")),
|
""")),
|
||||||
cfg.BoolOpt('registry_client_insecure',
|
cfg.BoolOpt('registry_client_insecure',
|
||||||
default=False,
|
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=_("""
|
help=_("""
|
||||||
Set verification of the registry server certificate.
|
Set verification of the registry server certificate.
|
||||||
|
|
||||||
|
@ -140,6 +180,14 @@ Related options:
|
||||||
cfg.IntOpt('registry_client_timeout',
|
cfg.IntOpt('registry_client_timeout',
|
||||||
default=600,
|
default=600,
|
||||||
min=0,
|
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=_("""
|
help=_("""
|
||||||
Timeout value for registry requests.
|
Timeout value for registry requests.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue