From 629d1042c87047534252cb2818c4b64eef50bf7b Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Tue, 28 May 2019 10:25:29 -0400 Subject: [PATCH] Update install docs for Keystone v3 Since the Keystone v2 API was removed in Queens, the Keystone setup documentation recommends using the same port (5000) for admin access as for regular internal/public access. Change-Id: Ic49acc5b57122fded11b5d17f8b51bf54dd29674 Task: 33508 --- doc/source/getting_started/standalone.rst | 4 ++-- doc/source/install/install-obs.rst | 4 ++-- doc/source/install/install-rdo.rst | 4 ++-- doc/source/install/install-ubuntu.rst | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/getting_started/standalone.rst b/doc/source/getting_started/standalone.rst index 696aab21b3..1f0207f5a9 100644 --- a/doc/source/getting_started/standalone.rst +++ b/doc/source/getting_started/standalone.rst @@ -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:: diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst index 24aa89d0db..7d3a97938c 100644 --- a/doc/source/install/install-obs.rst +++ b/doc/source/install/install-obs.rst @@ -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 diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst index fcb666e7f4..54072ed4aa 100644 --- a/doc/source/install/install-rdo.rst +++ b/doc/source/install/install-rdo.rst @@ -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 diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst index 643c7c2cb8..1882be3970 100644 --- a/doc/source/install/install-ubuntu.rst +++ b/doc/source/install/install-ubuntu.rst @@ -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