From 09b20b1b8493bef07cfc1caa8c345eba7ae33062 Mon Sep 17 00:00:00 2001 From: ruichen Date: Thu, 13 Feb 2014 19:12:21 +0800 Subject: [PATCH] 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 --- cinder/compute/nova.py | 2 +- etc/cinder/cinder.conf.sample | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py index 6d731e166..647edda43 100644 --- 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 56f3ec55d..c4ab1ca62 100644 --- 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= # Same as nova_endpoint_template, but for admin endpoint. -- 2.45.2