Browse Source

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
tags/2014.1.b3
ruichen 5 years ago
parent
commit
09b20b1b84
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      cinder/compute/nova.py
  2. 2
    2
      etc/cinder/cinder.conf.sample

+ 1
- 1
cinder/compute/nova.py View File

@@ -37,7 +37,7 @@ nova_opts = [
37 37
     cfg.StrOpt('nova_endpoint_template',
38 38
                default=None,
39 39
                help='Override service catalog lookup with template for nova '
40
-                    'endpoint e.g. http://localhost:8774/v2/%(tenant_id)s'),
40
+                    'endpoint e.g. http://localhost:8774/v2/%(project_id)s'),
41 41
     cfg.StrOpt('nova_endpoint_admin_template',
42 42
                default=None,
43 43
                help='Same as nova_endpoint_template, but for admin endpoint.'),

+ 2
- 2
etc/cinder/cinder.conf.sample View File

@@ -408,8 +408,8 @@
408 408
 #nova_catalog_admin_info=compute:nova:adminURL
409 409
 
410 410
 # Override service catalog lookup with template for nova
411
-# endpoint e.g. http://localhost:8774/v2/%(tenant_id)s (string
412
-# value)
411
+# endpoint e.g. http://localhost:8774/v2/%(project_id)s
412
+# (string value)
413 413
 #nova_endpoint_template=<None>
414 414
 
415 415
 # Same as nova_endpoint_template, but for admin endpoint.

Loading…
Cancel
Save