openstack
/
zaqar
Code Issues Proposed changes

Merge "Update auth_uri option to www_authenticate_uri"

This commit is contained in:
Zuul 2018-04-20 11:58:39 +00:00 committed by Gerrit Code Review
parent 1f774925c1 7b8776e483
commit 85529379be
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -247,8 +247,8 @@ function start_zaqar {
run_process zaqar-websocket "$ZAQAR_BIN_DIR/zaqar-server --config-file $ZAQAR_CONF"
echo "Waiting for Zaqar to start..."
local auth_uri=http://${ZAQAR_SERVICE_HOST}/identity
token=$(openstack token issue -c id -f value --os-auth-url ${auth_uri})
local www_authenticate_uri=http://${ZAQAR_SERVICE_HOST}/identity
token=$(openstack token issue -c id -f value --os-auth-url ${www_authenticate_uri})
if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q --header=\"Client-ID:$(uuidgen)\" --header=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOCOL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then
die $LINENO "Zaqar did not start"
fi

4
devstack/upgrade/upgrade.sh
View File

@ -65,8 +65,8 @@ source $ZAQAR_DEVSTACK_DIR/plugin.sh
set -o xtrace
function wait_for_keystone {
local auth_uri=http://${ZAQAR_SERVICE_HOST}/identity
if ! wait_for_service $SERVICE_TIMEOUT ${auth_uri}/v$IDENTITY_API_VERSION/; then
local www_authenticate_uri=http://${ZAQAR_SERVICE_HOST}/identity
if ! wait_for_service $SERVICE_TIMEOUT ${www_authenticate_uri}/v$IDENTITY_API_VERSION/; then
die $LINENO "keystone did not start"
fi
}

2
doc/source/install/install-obs.rst
View File

@ -393,7 +393,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
password = ZAQARIDENTITYPASSWORD
# Complete public Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
# Complete admin Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
auth_url = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357

2
doc/source/install/install-rdo.rst
View File

@ -393,7 +393,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
password = ZAQARIDENTITYPASSWORD
# Complete public Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
# Complete admin Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
identity_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357

2
doc/source/install/install-ubuntu.rst
View File

@ -381,7 +381,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
password = ZAQARIDENTITYPASSWORD
# Complete public Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
# Complete admin Identity API endpoint (HTTPS protocol is more preferable
# than HTTP).
identity_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357