From: Michał Dulko <michal.dulko@intel.com>
Date: Thu, 22 Oct 2015 19:49:13 +0000 (+0200)
Subject: Add protocol to help of glance_api_servers option
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=acfdadd192b32e6aeb0dd4d53c5d9710d77e7e84;p=openstack-build%2Fcinder-build.git

Add protocol to help of glance_api_servers option

Help for glance_api_servers option lacked information that it is
possible to specify protocol there (http or https) and suggested that
it isn't possible to use HTTPS in connection from Cinder to Glance.
This commit expands the message to include such information.

Change-Id: I5afa33193b6dda2477e5a28fa042e625d449257b
Closes-Bug: 1509065
---

diff --git a/cinder/common/config.py b/cinder/common/config.py
index de45905fa..14793fa25 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -65,8 +65,9 @@ global_opts = [
                help='Default glance port'),
     cfg.ListOpt('glance_api_servers',
                 default=['$glance_host:$glance_port'],
-                help='A list of the glance API servers available to cinder '
-                     '([hostname|ip]:port)'),
+                help='A list of the URLs of glance API servers available to '
+                     'cinder ([http[s]://][hostname|ip]:port). If protocol '
+                     'is not specified it defaults to http.'),
     cfg.IntOpt('glance_api_version',
                default=1,
                help='Version of the glance API to use'),