From 0e728eee7e5b886b1d96273b5cd7d1584497f56f Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Sat, 12 May 2018 23:27:02 +0800 Subject: [PATCH] update some documents about the keystone "API v2.0" As keystone has removed identity API v2.0,so update some related docs for more information,see [0] Change-Id: I2fcb090a80ed073241ecb4ab1d0778926a69b153 --- barbican/tests/test_middleware_auth.py | 2 +- bin/keystone_data.sh | 4 ++-- doc/source/configuration/keystone.rst | 4 ++-- doc/source/contributor/devstack.rst | 2 +- doc/source/install/common_configure.rst | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/barbican/tests/test_middleware_auth.py b/barbican/tests/test_middleware_auth.py index a2d9f046a..6cdbddc99 100644 --- a/barbican/tests/test_middleware_auth.py +++ b/barbican/tests/test_middleware_auth.py @@ -35,7 +35,7 @@ expected_response = {"v1": "current", "build": "0.1.34dev"} # curl -XPOST -d '{"auth":{"passwordCredentials":{"username": "demo", # "password": "secret"}, "tenantName": "demo"}}' -# -H "Content-type: application/json" http://localhost:35357/v2.0/tokens +# -H "Content-type: application/json" http://localhost:5000/v3/tokens # # pull out the token_id from above and use in ping_barbican # diff --git a/bin/keystone_data.sh b/bin/keystone_data.sh index 3a080e1e0..77d74725f 100755 --- a/bin/keystone_data.sh +++ b/bin/keystone_data.sh @@ -17,7 +17,7 @@ export OS_USERNAME="nova" # alternately service_token and endpoint #export OS_TOKEN=orange -#export OS_URL=http://localhost:35357/v2.0 +#export OS_URL=http://localhost:5000/v3 # ======================================== echo " OS_URL="$OS_URL @@ -45,7 +45,7 @@ KEYSTONE_CATALOG_BACKEND='sql' SERVICE_PROJECT=$(openstack project show "$SERVICE_PROJECT_NAME" -f value -c id) ADMIN_ROLE=$(openstack role show admin -f value -c id) -# Ports to avoid: 3333, 5000, 8773, 8774, 8776, 9292, 9696, 35357 +# Ports to avoid: 3333, 5000, 8773, 8774, 8776, 9292, 9696 # Barbican if [[ "$ENABLED_SERVICES" =~ "barbican" ]]; then # diff --git a/doc/source/configuration/keystone.rst b/doc/source/configuration/keystone.rst index 28c3daad8..7a7e4d82f 100644 --- a/doc/source/configuration/keystone.rst +++ b/doc/source/configuration/keystone.rst @@ -55,7 +55,7 @@ the get version call. project_name = {YOUR_KEYSTONE_PROJECT} project_domain_id = {YOUR_KEYSTONE_PROJECT_DOMAIN} www_authenticate_uri = http://{YOUR_KEYSTONE_ENDPOINT}:5000/v3 - auth_url = http://{YOUR_KEYSTONE_ENDPOINT}:35357/v3 + auth_url = http://{YOUR_KEYSTONE_ENDPOINT}:5000/v3 Alternatively, you can shorten this to @@ -77,7 +77,7 @@ the get version call. project_name = {YOUR_KEYSTONE_PROJECT} project_domain_id = {YOUR_KEYSTONE_PROJECT_DOMAIN} www_authenticate_uri = http://{YOUR_KEYSTONE_ENDPOINT}:5000/v3 - auth_url = http://{YOUR_KEYSTONE_ENDPOINT}:35357/v3 + auth_url = http://{YOUR_KEYSTONE_ENDPOINT}:5000/v3 3. Start Barbican ``{barbican_home}/bin/barbican.sh start`` diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst index 8b749ca3f..b998c0f9f 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -89,7 +89,7 @@ to expose the following ports #. Barbican - ``9311`` #. Keystone API - ``5000`` -#. Keystone Admin API - ``35357`` +#. Keystone Admin API - ``5000`` Installation ^^^^^^^^^^^^ diff --git a/doc/source/install/common_configure.rst b/doc/source/install/common_configure.rst index d5d6fa4cf..6f04e8edb 100644 --- a/doc/source/install/common_configure.rst +++ b/doc/source/install/common_configure.rst @@ -32,7 +32,7 @@ [keystone_authtoken] ... www_authenticate_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000 memcached_servers = controller:11211 auth_type = password project_domain_name = default