Merge "Fix manila devstack plugin for keystone v3 usage"

This commit is contained in:
Jenkins 2016-03-11 18:53:14 +00:00 committed by Gerrit Code Review
commit 4f803cae03

@ -171,11 +171,7 @@ function configure_manila {
# Remove old conf file if exists
rm -f $MANILA_CONF
iniset $MANILA_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
iniset $MANILA_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
iniset $MANILA_CONF keystone_authtoken admin_user manila
iniset $MANILA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $MANILA_CONF keystone_authtoken signing_dir $MANILA_AUTH_CACHE_DIR
configure_auth_token_middleware $MANILA_CONF manila $MANILA_AUTH_CACHE_DIR
iniset $MANILA_CONF DEFAULT auth_strategy keystone
iniset $MANILA_CONF DEFAULT debug True