From 26262b7943542e8b2ffe93db165977e9f58da5a2 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Fri, 11 Dec 2015 09:51:57 -0500
Subject: [PATCH] deprecate old glance config options

This deprecates the glance host, port, protocol options in
nova. api_servers is now the preferred way to do this.

Change-Id: I9054bcfb7f5a4a31f0bbfd770c00c767f3d165ba
---
 nova/image/glance.py                          | 20 +++++++++++++------
 ...eprecate_glance_opts-eab01aba5dcda38a.yaml |  6 ++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/deprecate_glance_opts-eab01aba5dcda38a.yaml

diff --git a/nova/image/glance.py b/nova/image/glance.py
index 99a1aa32f0e9..5eb5af6eb8a6 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -45,21 +45,29 @@ import nova.image.download as image_xfers
 glance_opts = [
     cfg.StrOpt('host',
                default='$my_ip',
-               help='Default glance hostname or IP address'),
+               # TODO(sdague): remove in N
+               deprecated_for_removal=True,
+               help='Glance server hostname or IP address'),
     cfg.IntOpt('port',
                default=9292,
                min=1,
                max=65535,
-               help='Default glance port'),
+               # TODO(sdague): remove in N
+               deprecated_for_removal=True,
+               help='Glance server port'),
     cfg.StrOpt('protocol',
                 default='http',
                 choices=('http', 'https'),
-                help='Default protocol to use when connecting to glance. '
+                # TODO(sdague): remove in N
+                deprecated_for_removal=True,
+                help='Protocol to use when connecting to glance. '
                      'Set to https for SSL.'),
     cfg.ListOpt('api_servers',
-                help='A list of the glance api servers available to nova. '
-                     'Prefix with https:// for ssl-based glance api servers. '
-                     '([hostname|ip]:port)'),
+                help='''
+A list of the glance api servers endpoints available to nova. These
+should be fully qualified urls of the form
+"scheme://hostname:port[/path]" (i.e. "http://10.0.1.0:9292" or
+"https://my.glance.server/image")'''),
     cfg.BoolOpt('api_insecure',
                 default=False,
                 help='Allow to perform insecure SSL (https) requests to '
diff --git a/releasenotes/notes/deprecate_glance_opts-eab01aba5dcda38a.yaml b/releasenotes/notes/deprecate_glance_opts-eab01aba5dcda38a.yaml
new file mode 100644
index 000000000000..28c26d228e7a
--- /dev/null
+++ b/releasenotes/notes/deprecate_glance_opts-eab01aba5dcda38a.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+
+  - The host, port, and protocol options in the [glance] configuration
+    section are deprecated, and will be removed in the N release. The
+    api_servers value should be used instead.