From 82dea7c64a1a7ac81a1a02753e516bb1d67eebd2 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 16 Oct 2013 18:57:15 -0400 Subject: [PATCH] Use cinder.conf for auth_token configs. Updates lib/cinder so that we use the application config file (cinder.conf) instead of the Cinder api-paste.ini config file. Related-Bug #1240753 Change-Id: I6636d33ee522757145ac97fc354324a8b9379700 --- lib/cinder | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/cinder b/lib/cinder index 220488a07e..f6f137cabd 100644 --- a/lib/cinder +++ b/lib/cinder @@ -202,15 +202,25 @@ function configure_cinder() { sudo mv $TEMPFILE /etc/sudoers.d/cinder-rootwrap cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI - iniset $CINDER_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST - iniset $CINDER_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT - iniset $CINDER_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL - iniset $CINDER_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME - iniset $CINDER_API_PASTE_INI filter:authtoken admin_user cinder - iniset $CINDER_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD - iniset $CINDER_API_PASTE_INI filter:authtoken signing_dir $CINDER_AUTH_CACHE_DIR + + inicomment $CINDER_API_PASTE_INI filter:authtoken auth_host + inicomment $CINDER_API_PASTE_INI filter:authtoken auth_port + inicomment $CINDER_API_PASTE_INI filter:authtoken auth_protocol + inicomment $CINDER_API_PASTE_INI filter:authtoken admin_tenant_name + inicomment $CINDER_API_PASTE_INI filter:authtoken admin_user + inicomment $CINDER_API_PASTE_INI filter:authtoken admin_password + inicomment $CINDER_API_PASTE_INI filter:authtoken signing_dir cp $CINDER_DIR/etc/cinder/cinder.conf.sample $CINDER_CONF + + iniset $CINDER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST + iniset $CINDER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT + iniset $CINDER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL + iniset $CINDER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME + iniset $CINDER_CONF keystone_authtoken admin_user cinder + iniset $CINDER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD + iniset $CINDER_CONF keystone_authtoken signing_dir $CINDER_AUTH_CACHE_DIR + iniset $CINDER_CONF DEFAULT auth_strategy keystone iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $CINDER_CONF DEFAULT verbose True