From 056000230a2b44908193e61de2d17d89434e7ea8 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 19 Apr 2018 15:43:35 -0400 Subject: [PATCH] Update docs for [keystone_authtoken] changes since Queens The auth_uri option was deprecated and renamed in Queens: I0cf11da3d395749df28077427689fdafc8a6b981 The auth_uri option is also no longer necessary, at least for the purpose of the nova install guide, since all identity service requests can be served through the single auth_url. This change removes auth_uri usage and also updates the auth_url value to match what is in the keystone install guide: https://docs.openstack.org/keystone/queens/install/keystone-install-ubuntu.html Change-Id: Iff332890cbe1ba5b3876874e351b09c377d8dd5d Closes-Bug: #1765144 (cherry picked from commit 698630e1a432aa1f292fabe8d738a2f5867f73fe) --- doc/source/install/compute-install-obs.rst | 5 ++--- doc/source/install/compute-install-rdo.rst | 5 ++--- doc/source/install/compute-install-ubuntu.rst | 5 ++--- doc/source/install/controller-install-obs.rst | 5 ++--- doc/source/install/controller-install-rdo.rst | 5 ++--- doc/source/install/controller-install-ubuntu.rst | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst index 94a88477c4f5..bcc2b1697497 100644 --- a/doc/source/install/compute-install-obs.rst +++ b/doc/source/install/compute-install-obs.rst @@ -74,8 +74,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -179,7 +178,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS diff --git a/doc/source/install/compute-install-rdo.rst b/doc/source/install/compute-install-rdo.rst index 246bb2414742..ab7406adf3ac 100644 --- a/doc/source/install/compute-install-rdo.rst +++ b/doc/source/install/compute-install-rdo.rst @@ -66,8 +66,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -170,7 +169,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS diff --git a/doc/source/install/compute-install-ubuntu.rst b/doc/source/install/compute-install-ubuntu.rst index e808c88bed13..59e231811049 100644 --- a/doc/source/install/compute-install-ubuntu.rst +++ b/doc/source/install/compute-install-ubuntu.rst @@ -56,8 +56,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -167,7 +166,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS diff --git a/doc/source/install/controller-install-obs.rst b/doc/source/install/controller-install-obs.rst index 54d79a0fa9f9..7b20ffc462e9 100644 --- a/doc/source/install/controller-install-obs.rst +++ b/doc/source/install/controller-install-obs.rst @@ -327,8 +327,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -415,7 +414,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst index 99859769f045..fee569bedb7c 100644 --- a/doc/source/install/controller-install-rdo.rst +++ b/doc/source/install/controller-install-rdo.rst @@ -317,8 +317,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -405,7 +404,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst index 694a66adc9d1..2e619d7396f7 100644 --- a/doc/source/install/controller-install-ubuntu.rst +++ b/doc/source/install/controller-install-ubuntu.rst @@ -307,8 +307,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 - auth_url = http://controller:35357 + auth_url = http://controller:5000/v3 memcached_servers = controller:11211 auth_type = password project_domain_name = default @@ -398,7 +397,7 @@ Install and configure components project_name = service auth_type = password user_domain_name = Default - auth_url = http://controller:35357/v3 + auth_url = http://controller:5000/v3 username = placement password = PLACEMENT_PASS