From d7af4843382d0f281a35e3769109da7beda1dfc5 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Tue, 25 Nov 2014 12:10:07 +1000
Subject: [PATCH] Use the service catalog when talking to cinder

The cinder endpoints should be correctly established in the service
catalog. There is no reason to provide an overriding endpoint_template.

Change-Id: I9b206fa22a8271a0fb65789d139ead35dfb1ea0d
---
 lib/nova | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/nova b/lib/nova
index 32ab567023..2ebba40cfb 100644
--- a/lib/nova
+++ b/lib/nova
@@ -458,7 +458,6 @@ function create_nova_conf {
         if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
             CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
             CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
-            iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
             iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE
         fi
     fi