From afc1423e70074762e5c8d74b7295b9e55f91a44c Mon Sep 17 00:00:00 2001 From: git-harry Date: Thu, 8 Jan 2015 17:37:40 +0000 Subject: [PATCH] Change default nova service name in cinder.conf In cinder the config options nova_catalog_info and nova_catalog_admin_info define values to be matched when searching for the correct compute service in the catalog. The commit 5ad15c040fdc115bca9efb1c952279988a2a48b3 in the cinder project has changed these defaults. This commit sets the options in cinder.conf to the values set by devstack. Change-Id: I2a0b09c34fac5f63a5cdbbe05761a0857f243465 Closes-Bug: #1408734 --- lib/cinder | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/cinder b/lib/cinder index c106424378..9d27daa091 100644 --- a/lib/cinder +++ b/lib/cinder @@ -110,6 +110,12 @@ if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then done fi +# Change the default nova_catalog_info and nova_catalog_admin_info values in +# cinder so that the service name cinder is searching for matches that set for +# nova in keystone. +CINDER_NOVA_CATALOG_INFO=${CINDER_NOVA_CATALOG_INFO:-compute:nova:publicURL} +CINDER_NOVA_CATALOG_ADMIN_INFO=${CINDER_NOVA_CATALOG_ADMIN_INFO:-compute:nova:adminURL} + # Functions # --------- @@ -220,6 +226,9 @@ function configure_cinder { configure_auth_token_middleware $CINDER_CONF cinder $CINDER_AUTH_CACHE_DIR + iniset $CINDER_CONF DEFAULT nova_catalog_info $CINDER_NOVA_CATALOG_INFO + iniset $CINDER_CONF DEFAULT nova_catalog_admin_info $CINDER_NOVA_CATALOG_ADMIN_INFO + iniset $CINDER_CONF DEFAULT auth_strategy keystone iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $CINDER_CONF DEFAULT verbose True