From e91f31663c2164fc33655dbbb8fdcbb12c552092 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Fri, 3 Mar 2017 17:09:45 -0500 Subject: [PATCH] Deprecate support for glance v1 Nova dropped support for glance v1 in Ocata and we're going to disable glance v1 in CI runs for Pike. The glance v1 API is deprecated so we should start burning it out of the system in all of the projects. Closes-Bug: #1670423 Change-Id: I1398f81b28e1b000ee110c159e498b72e3746109 --- etc/ironic/ironic.conf.sample | 7 ++++++- ironic/conf/glance.py | 5 ++++- .../deprecate-support-for-glance-v1-8b194e6b20cbfebb.yaml | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/deprecate-support-for-glance-v1-8b194e6b20cbfebb.yaml diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index d98fe9c347..001ad5e4d5 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1434,9 +1434,14 @@ # [hostname|IP]:port. (list value) #glance_api_servers = -# Glance API version (1 or 2) to use. (integer value) +# DEPRECATED: Glance API version (1 or 2) to use. (integer +# value) # Minimum value: 1 # Maximum value: 2 +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Ironic will only support using Glance API version 2 +# in the Queens release. #glance_api_version = 2 # Optional path to a CA certificate bundle to be used to diff --git a/ironic/conf/glance.py b/ironic/conf/glance.py index d8642cf40e..99f49d07f5 100644 --- a/ironic/conf/glance.py +++ b/ironic/conf/glance.py @@ -143,7 +143,10 @@ opts = [ 'used when glance_api_insecure is set to False.')), cfg.IntOpt('glance_api_version', help=_('Glance API version (1 or 2) to use.'), - min=1, max=2, default=2), + min=1, max=2, default=2, + deprecated_for_removal=True, + deprecated_reason=_('Ironic will only support using Glance API ' + 'version 2 in the Queens release.')), ] diff --git a/releasenotes/notes/deprecate-support-for-glance-v1-8b194e6b20cbfebb.yaml b/releasenotes/notes/deprecate-support-for-glance-v1-8b194e6b20cbfebb.yaml new file mode 100644 index 0000000000..65e2003bb7 --- /dev/null +++ b/releasenotes/notes/deprecate-support-for-glance-v1-8b194e6b20cbfebb.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + Support for the Image service v1 API has been deprecated along with the + ``[glance]/glance_api_version`` configuration option and will be removed in + the `Queens` release.