From 8a3358e2d13074b5bdb2a60028b7e6c440d2f935 Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Fri, 11 May 2018 09:54:02 +0700 Subject: [PATCH] Replace deprecated "auth_uri" by "www_authenticate_uri" According to [1], "auth_uri" has been deprecated. This patch replace it by using "www_authenticate_uri" instead. [1] https://review.openstack.org/#/c/508522 Change-Id: I3242394fd4ebfa7eda390be872372a53b5311a46 --- doc/source/configuration/_flagmappings/ec2api.flagmappings | 2 +- install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/configuration/_flagmappings/ec2api.flagmappings b/doc/source/configuration/_flagmappings/ec2api.flagmappings index 08a48146..100a3dd4 100644 --- a/doc/source/configuration/_flagmappings/ec2api.flagmappings +++ b/doc/source/configuration/_flagmappings/ec2api.flagmappings @@ -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 diff --git a/install.sh b/install.sh index b70e01e0..8db3fefa 100755 --- a/install.sh +++ b/install.sh @@ -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