Merge "Removed admin_* from devstack config"
This commit is contained in:
commit
6e19837ad1
@ -151,15 +151,12 @@ function create_magnum_conf {
|
||||
iniset $MAGNUM_CONF keystone_auth project_domain_id default
|
||||
iniset $MAGNUM_CONF keystone_auth user_domain_id default
|
||||
|
||||
# FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it
|
||||
# after deprecation period.
|
||||
iniset $MAGNUM_CONF keystone_authtoken admin_user magnum
|
||||
iniset $MAGNUM_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
|
||||
iniset $MAGNUM_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
|
||||
|
||||
configure_auth_token_middleware $MAGNUM_CONF magnum $MAGNUM_AUTH_CACHE_DIR
|
||||
|
||||
iniset $MAGNUM_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3
|
||||
|
||||
# FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it
|
||||
# after deprecation period.
|
||||
iniset $MAGNUM_CONF keystone_authtoken www_authenticate_uri $KEYSTONE_SERVICE_URI_V3
|
||||
iniset $MAGNUM_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3
|
||||
iniset $MAGNUM_CONF keystone_authtoken auth_version v3
|
||||
|
Loading…
Reference in New Issue
Block a user