summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Harney <eharney@redhat.com>2016-04-06 17:56:53 -0400
committerEric Harney <eharney@redhat.com>2016-04-06 18:33:22 -0400
commit448e760ed3608ac1d6fd194b746cd38e9d661a38 (patch)
treebc0b0b87d94d35ef14b25a9d20ee4252d1038171
parentb8aa9d32e494aa675b97ad5af7b37dbdaed6b666 (diff)
Configure nova catalog info in Cinder
Cinder's defaults don't match what devstack creates. Change-Id: I570c7da9ff5b54ce36240a9375fbbfdcffc1b906
Notes
Notes (review): Code-Review+2: Eric Harney <eharney@redhat.com> Workflow+1: Eric Harney <eharney@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 07 Apr 2016 13:27:59 +0000 Reviewed-on: https://review.openstack.org/302450 Project: openstack/devstack-plugin-nfs Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh6
1 files changed, 6 insertions, 0 deletions
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 {
67 ${NFS_SECURE_FILE_OPERATIONS} 67 ${NFS_SECURE_FILE_OPERATIONS}
68 iniset $CINDER_CONF nfs nas_secure_file_permissions \ 68 iniset $CINDER_CONF nfs nas_secure_file_permissions \
69 ${NFS_SECURE_FILE_PERMISSIONS} 69 ${NFS_SECURE_FILE_PERMISSIONS}
70
71 # Point Cinder to the Nova service correctly
72 # Cinder's defaults don't match what devstack sets up.
73 iniset $CINDER_CONF DEFAULT nova_catalog_info compute:nova:publicURL
74 iniset $CINDER_CONF DEFAULT nova_catalog_admin_info compute:nova:adminURL
75
70} 76}
71 77
72 78