summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Komawar <nik.komawar@gmail.com>2016-07-26 22:08:28 -0400
committerNikhil Komawar <nik.komawar@gmail.com>2016-07-27 02:13:49 +0000
commit10f50da5fcd9257090ab137f4d257940bb01b44a (patch)
tree56bb272de30070af60cba5540ea28be76c7d0f48
parenta4b43bcd01ee56a56348521362777103ed84681a (diff)
downloadglance_store-10f50da5fcd9257090ab137f4d257940bb01b44a.tar.gz
Fix cinder config string as per current i18n state0.15.0
As described in the bug 1605648 , the translations being done on the config string are not permitting additions so, the glance docs generation is failing. The glance_store 0.14.0 had to be pinned down to let glance review queue not break. see updates on this thread http://lists.openstack.org/pipermail/openstack-docs/2016-July/thread.html#8899 The config strings need to be non additive for translations and will enable future releases of glance_store. Once, a appropriate fix is published for bug 1605648 the config strings can be more flexible. Change-Id: Ia6ed5883458f2e81e861cda02068956728e76357 Closes-Bug: 1606746 Partial-Bug: 1605648
-rw-r--r--glance_store/_drivers/cinder.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py
index 1ae3c79..8fe1d33 100644
--- a/glance_store/_drivers/cinder.py
+++ b/glance_store/_drivers/cinder.py
@@ -55,8 +55,7 @@ _CINDER_OPTS = [
'<service_type>:<service_name>:<endpoint_type>')),
cfg.StrOpt('cinder_endpoint_template',
help=_('Override service catalog lookup with template for '
- 'cinder endpoint e.g. '
- 'http://localhost:8776/v2/%(tenant)s')),
+ 'cinder endpoint.')),
cfg.StrOpt('cinder_os_region_name', deprecated_name='os_region_name',
help=_('Region name of this node. If specified, it will be '
'used to locate OpenStack services for stores.')),