openstack
/
ec2-api
Code Issues Proposed changes

Merge "Replace deprecated "auth_uri" by "www_authenticate_uri""

This commit is contained in:
Zuul 2018-05-21 19:37:51 +00:00 committed by Gerrit Code Review
parent c2f3da8055 8a3358e2d1
commit 1bd036ce28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration/_flagmappings/ec2api.flagmappings
View File

@ -118,7 +118,7 @@ keystone_authtoken/auth_port disable
keystone_authtoken/auth_protocol disable
keystone_authtoken/auth_section disable
keystone_authtoken/auth_type disable
keystone_authtoken/auth_uri disable
keystone_authtoken/www_authenticate_uri disable
keystone_authtoken/auth_version disable
keystone_authtoken/cache disable
keystone_authtoken/cafile disable

2
install.sh
View File

@ -294,7 +294,7 @@ iniset $CONF_FILE DEFAULT state_path "$DATA_DIR"
GROUP_AUTHTOKEN="keystone_authtoken"
iniset $CONF_FILE $GROUP_AUTHTOKEN signing_dir "$AUTH_CACHE_DIR"
iniset $CONF_FILE $GROUP_AUTHTOKEN auth_uri "$OS_AUTH_URL"
iniset $CONF_FILE $GROUP_AUTHTOKEN www_authenticate_uri "$OS_AUTH_URL"
iniset $CONF_FILE $GROUP_AUTHTOKEN auth_url "$OS_AUTH_URL"
iniset $CONF_FILE $GROUP_AUTHTOKEN username $SERVICE_USERNAME
iniset $CONF_FILE $GROUP_AUTHTOKEN password $SERVICE_PASSWORD