From 698630e1a432aa1f292fabe8d738a2f5867f73fe Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 19 Apr 2018 15:43:35 -0400 Subject: 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 --- 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(-) (limited to 'doc') diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst index 84c662d4b5..ff5d0e77a3 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 @@ -184,7 +183,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 b86a843f5c..35bdf42043 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 @@ -175,7 +174,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 0c8d018382..e025dfec9c 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 @@ -172,7 +171,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 53534af323..cd70061e0b 100644 --- a/doc/source/install/controller-install-obs.rst +++ b/doc/source/install/controller-install-obs.rst @@ -335,8 +335,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 @@ -428,7 +427,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 a9972de3cf..92174761ae 100644 --- a/doc/source/install/controller-install-rdo.rst +++ b/doc/source/install/controller-install-rdo.rst @@ -325,8 +325,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 @@ -418,7 +417,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 f9274c93b9..3d6b1b04a3 100644 --- a/doc/source/install/controller-install-ubuntu.rst +++ b/doc/source/install/controller-install-ubuntu.rst @@ -315,8 +315,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 @@ -411,7 +410,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 -- cgit v1.2.1