From 0d286089b2e74f84c3d096d0620358537a5be2e6 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 23 Apr 2014 14:47:17 +0400 Subject: [PATCH] Remove obsolete sahara keystone auth conf Change-Id: I9005d99540572bd1e9251683b1e9cc6638afa7e7 --- lib/sahara | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/sahara b/lib/sahara index d56cf1b444..934989b2d6 100644 --- a/lib/sahara +++ b/lib/sahara @@ -110,14 +110,6 @@ function configure_sahara { sudo chown $STACK_USER $SAHARA_AUTH_CACHE_DIR rm -rf $SAHARA_AUTH_CACHE_DIR/* - # Set obsolete keystone auth configs for backward compatibility - iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_AUTH_HOST - iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_AUTH_PORT - iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_AUTH_PROTOCOL - iniset $SAHARA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD - iniset $SAHARA_CONF_FILE DEFAULT os_admin_username sahara - iniset $SAHARA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME - # Set actual keystone auth configs iniset $SAHARA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/ iniset $SAHARA_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST