summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-05-11 09:54:02 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-05-11 09:54:02 +0700
commit8a3358e2d13074b5bdb2a60028b7e6c440d2f935 (patch)
tree8e8cc5da248f996815dfc12503c24cab840aafa6
parent6de1ac42951dc1da257912488da34d1547d13a69 (diff)
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
Notes
Notes (review): Code-Review+2: Andrey Pavlov <andrey.mp@gmail.com> Workflow+1: Andrey Pavlov <andrey.mp@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 21 May 2018 19:37:51 +0000 Reviewed-on: https://review.openstack.org/567728 Project: openstack/ec2-api Branch: refs/heads/master
-rw-r--r--doc/source/configuration/_flagmappings/ec2api.flagmappings2
-rwxr-xr-xinstall.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/configuration/_flagmappings/ec2api.flagmappings b/doc/source/configuration/_flagmappings/ec2api.flagmappings
index 08a4814..100a3dd 100644
--- a/doc/source/configuration/_flagmappings/ec2api.flagmappings
+++ b/doc/source/configuration/_flagmappings/ec2api.flagmappings
@@ -118,7 +118,7 @@ keystone_authtoken/auth_port disable
118keystone_authtoken/auth_protocol disable 118keystone_authtoken/auth_protocol disable
119keystone_authtoken/auth_section disable 119keystone_authtoken/auth_section disable
120keystone_authtoken/auth_type disable 120keystone_authtoken/auth_type disable
121keystone_authtoken/auth_uri disable 121keystone_authtoken/www_authenticate_uri disable
122keystone_authtoken/auth_version disable 122keystone_authtoken/auth_version disable
123keystone_authtoken/cache disable 123keystone_authtoken/cache disable
124keystone_authtoken/cafile disable 124keystone_authtoken/cafile disable
diff --git a/install.sh b/install.sh
index b70e01e..8db3fef 100755
--- a/install.sh
+++ b/install.sh
@@ -294,7 +294,7 @@ iniset $CONF_FILE DEFAULT state_path "$DATA_DIR"
294 294
295GROUP_AUTHTOKEN="keystone_authtoken" 295GROUP_AUTHTOKEN="keystone_authtoken"
296iniset $CONF_FILE $GROUP_AUTHTOKEN signing_dir "$AUTH_CACHE_DIR" 296iniset $CONF_FILE $GROUP_AUTHTOKEN signing_dir "$AUTH_CACHE_DIR"
297iniset $CONF_FILE $GROUP_AUTHTOKEN auth_uri "$OS_AUTH_URL" 297iniset $CONF_FILE $GROUP_AUTHTOKEN www_authenticate_uri "$OS_AUTH_URL"
298iniset $CONF_FILE $GROUP_AUTHTOKEN auth_url "$OS_AUTH_URL" 298iniset $CONF_FILE $GROUP_AUTHTOKEN auth_url "$OS_AUTH_URL"
299iniset $CONF_FILE $GROUP_AUTHTOKEN username $SERVICE_USERNAME 299iniset $CONF_FILE $GROUP_AUTHTOKEN username $SERVICE_USERNAME
300iniset $CONF_FILE $GROUP_AUTHTOKEN password $SERVICE_PASSWORD 300iniset $CONF_FILE $GROUP_AUTHTOKEN password $SERVICE_PASSWORD