From c04ac03e21546a3d25a2b6794802c4988f4ff532 Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Tue, 23 May 2017 16:52:35 +0200 Subject: [PATCH] Change deprecated nova settings Change-Id: I0d129150411ede344c9b710d1aca5af1df3478b6 --- lib/cinder | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/cinder b/lib/cinder index bc0c13fb88..59bcf8235c 100644 --- a/lib/cinder +++ b/lib/cinder @@ -230,16 +230,6 @@ function configure_cinder { configure_auth_token_middleware $CINDER_CONF cinder $CINDER_AUTH_CACHE_DIR - # 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. - if [[ -n "$CINDER_NOVA_CATALOG_INFO" ]]; then - iniset $CINDER_CONF DEFAULT nova_catalog_info $CINDER_NOVA_CATALOG_INFO - fi - if [[ -n "$CINDER_NOVA_CATALOG_ADMIN_INFO" ]]; then - iniset $CINDER_CONF DEFAULT nova_catalog_admin_info $CINDER_NOVA_CATALOG_ADMIN_INFO - fi - iniset $CINDER_CONF DEFAULT auth_strategy keystone iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL @@ -254,8 +244,6 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP" - iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" - iniset $CINDER_CONF key_manager api_class cinder.keymgr.conf_key_mgr.ConfKeyManager if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then @@ -332,10 +320,9 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT glance_api_version 2 fi - # Set os_privileged_user credentials (used for os-assisted-snapshots) - iniset $CINDER_CONF DEFAULT os_privileged_user_name nova - iniset $CINDER_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD" - iniset $CINDER_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME" + # Set nova credentials (used for os-assisted-snapshots) + configure_auth_token_middleware $CINDER_CONF nova $CINDER_AUTH_CACHE_DIR nova + iniset $CINDER_CONF nova region_name "$REGION_NAME" iniset $CINDER_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT" if [[ ! -z "$CINDER_COORDINATION_URL" ]]; then