openstack
/
heat
Code Issues Proposed changes

Merge "Update install docs for Keystone v3"

This commit is contained in:
Zuul 2019-07-24 12:56:52 +00:00 committed by Gerrit Code Review
parent 208cdfea39 629d1042c8
commit 6ad9d3f43a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/getting_started/standalone.rst
View File

@ -31,7 +31,7 @@ The localrc looked like this::
HEAT_STANDALONE=True
KEYSTONE_AUTH_HOST=192.168.1.88
KEYSTONE_AUTH_PORT=35357
KEYSTONE_AUTH_PORT=5000
KEYSTONE_AUTH_PROTOCOL=http
KEYSTONE_SERVICE_HOST=$KEYSTONE_AUTH_HOST
KEYSTONE_SERVICE_PORT=$KEYSTONE_AUTH_PORT
@ -72,7 +72,7 @@ Now make a file to store your new environment (heat.env).
export OS_USERNAME=admin
export OS_TENANT_NAME=demo
export OS_PASSWORD=abetterpasswordthanthis
export OS_AUTH_URL=http://192.168.1.88:35357/v2.0/
export OS_AUTH_URL=http://192.168.1.88:5000/v3/
Now you use this like::

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

@ -357,7 +357,7 @@ Install and configure components
[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
@ -369,7 +369,7 @@ Install and configure components
[trustee]
...
auth_type = password
auth_url = http://controller:35357
auth_url = http://controller:5000
username = heat
password = HEAT_PASS
user_domain_name = default

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

@ -368,7 +368,7 @@ Install and configure components
[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
@ -380,7 +380,7 @@ Install and configure components
[trustee]
...
auth_type = password
auth_url = http://controller:35357
auth_url = http://controller:5000
username = heat
password = HEAT_PASS
user_domain_name = default

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

@ -356,7 +356,7 @@ Install and configure components
[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
@ -368,7 +368,7 @@ Install and configure components
[trustee]
...
auth_type = password
auth_url = http://controller:35357
auth_url = http://controller:5000
username = heat
password = HEAT_PASS
user_domain_name = default