openstack
/
barbican
Code Issues Proposed changes

Merge "update some documents about the keystone "API v2.0""

This commit is contained in:
Zuul 2018-06-04 16:09:59 +00:00 committed by Gerrit Code Review
parent 91a6855401 0e728eee7e
commit 47b99997c0
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/tests/test_middleware_auth.py
View File

@ -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
#

4
bin/keystone_data.sh
View File

@ -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
#

4
doc/source/configuration/keystone.rst
View File

@ -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``

2
doc/source/contributor/devstack.rst
View File

@ -89,7 +89,7 @@ to expose the following ports
#. Barbican - ``9311``
#. Keystone API - ``5000``
#. Keystone Admin API - ``35357``
#. Keystone Admin API - ``5000``
Installation
^^^^^^^^^^^^

2
doc/source/install/common_configure.rst
View File

@ -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