From 448e760ed3608ac1d6fd194b746cd38e9d661a38 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 6 Apr 2016 17:56:53 -0400
Subject: [PATCH] Configure nova catalog info in Cinder

Cinder's defaults don't match what devstack creates.

Change-Id: I570c7da9ff5b54ce36240a9375fbbfdcffc1b906
---
 devstack/plugin.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3d82790..89cb0ef 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -67,6 +67,12 @@ function configure_cinder_nfs {
         ${NFS_SECURE_FILE_OPERATIONS}
     iniset $CINDER_CONF nfs nas_secure_file_permissions \
         ${NFS_SECURE_FILE_PERMISSIONS}
+
+    # Point Cinder to the Nova service correctly
+    # Cinder's defaults don't match what devstack sets up.
+    iniset $CINDER_CONF DEFAULT nova_catalog_info compute:nova:publicURL
+    iniset $CINDER_CONF DEFAULT nova_catalog_admin_info compute:nova:adminURL
+
 }