Fix wrong example of "nova_endpoint_template"

In cinder.conf

e.g. http://localhost:8774/v2/%(tenant_id)s

should be

e.g. http://localhost:8774/v2/%(project_id)s

Change-Id: I7dd3be9bc9d2e8f26619b00b5bdbc66505a984b2
Closes-Bug: #1279747

diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index 6d731e16639ded43ab80d6a6f69cce468cf06905..647edda432f2709fc63efe7b2d992738dfaeb9b0 100644 (file)
--- a/cinder/compute/nova.py
+++ b/cinder/compute/nova.py
@@ -37,7 +37,7 @@ nova_opts = [
     cfg.StrOpt('nova_endpoint_template',
                default=None,
                help='Override service catalog lookup with template for nova '
-                    'endpoint e.g. http://localhost:8774/v2/%(tenant_id)s'),
+                    'endpoint e.g. http://localhost:8774/v2/%(project_id)s'),
     cfg.StrOpt('nova_endpoint_admin_template',
                default=None,
                help='Same as nova_endpoint_template, but for admin endpoint.'),

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 56f3ec55d6979a46dc058db2b1eb5b61c7dec58b..c4ab1ca625b222d4817bcba70daa2dbb45d7a2a6 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -408,8 +408,8 @@
 #nova_catalog_admin_info=compute:nova:adminURL
 
 # Override service catalog lookup with template for nova
-# endpoint e.g. http://localhost:8774/v2/%(tenant_id)s (string
-# value)
+# endpoint e.g. http://localhost:8774/v2/%(project_id)s
+# (string value)
 #nova_endpoint_template=<None>
 
 # Same as nova_endpoint_template, but for admin endpoint.