openstack/cinder
Code Issues Proposed changes

Merge "Fix wrong example of "nova_endpoint_template""

Browse Source
This commit is contained in:
Jenkins 2014-02-15 19:30:57 +00:00 committed by Gerrit Code Review
commit b6e116c28c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/compute/nova.py
View File

@ -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.'),

4
etc/cinder/cinder.conf.sample
View File

@ -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.