Browse code
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
git-harry authored on 2015/01/09 02:37:40Showing 1 changed files
| ... | ... |
@@ -110,6 +110,12 @@ if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then |
| 110 | 110 |
done |
| 111 | 111 |
fi |
| 112 | 112 |
|
| 113 |
+# Change the default nova_catalog_info and nova_catalog_admin_info values in |
|
| 114 |
+# cinder so that the service name cinder is searching for matches that set for |
|
| 115 |
+# nova in keystone. |
|
| 116 |
+CINDER_NOVA_CATALOG_INFO=${CINDER_NOVA_CATALOG_INFO:-compute:nova:publicURL}
|
|
| 117 |
+CINDER_NOVA_CATALOG_ADMIN_INFO=${CINDER_NOVA_CATALOG_ADMIN_INFO:-compute:nova:adminURL}
|
|
| 118 |
+ |
|
| 113 | 119 |
|
| 114 | 120 |
# Functions |
| 115 | 121 |
# --------- |
| ... | ... |
@@ -220,6 +226,9 @@ function configure_cinder {
|
| 220 | 220 |
|
| 221 | 221 |
configure_auth_token_middleware $CINDER_CONF cinder $CINDER_AUTH_CACHE_DIR |
| 222 | 222 |
|
| 223 |
+ iniset $CINDER_CONF DEFAULT nova_catalog_info $CINDER_NOVA_CATALOG_INFO |
|
| 224 |
+ iniset $CINDER_CONF DEFAULT nova_catalog_admin_info $CINDER_NOVA_CATALOG_ADMIN_INFO |
|
| 225 |
+ |
|
| 223 | 226 |
iniset $CINDER_CONF DEFAULT auth_strategy keystone |
| 224 | 227 |
iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 225 | 228 |
iniset $CINDER_CONF DEFAULT verbose True |