diff --git a/doc/source/admin/archives/config-identity.rst b/doc/source/admin/archives/config-identity.rst index 7d57645876d..28c9d18ce52 100644 --- a/doc/source/admin/archives/config-identity.rst +++ b/doc/source/admin/archives/config-identity.rst @@ -301,6 +301,6 @@ running Compute and Networking with an IP address of 192.168.1.2: admin_tenant_name=service admin_username=neutron admin_password=password - admin_auth_url=http://192.168.1.2:35357/v2.0 + admin_auth_url=http://192.168.1.2:5000/v2.0 service_metadata_proxy=true metadata_proxy_shared_secret=foo diff --git a/doc/source/admin/config-dns-int-ext-serv.rst b/doc/source/admin/config-dns-int-ext-serv.rst index 79adb597ce2..1baba6ac22e 100644 --- a/doc/source/admin/config-dns-int-ext-serv.rst +++ b/doc/source/admin/config-dns-int-ext-serv.rst @@ -74,7 +74,7 @@ Once this is done, the user has to take the following steps and restart [designate] url = http://192.0.2.240:9001/v2 auth_type = password - auth_url = http://192.0.2.240:35357 + auth_url = http://192.0.2.240:5000 username = neutron password = PASSWORD project_name = service diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst index 1c907a52fc0..d6fb6e49274 100644 --- a/doc/source/install/compute-install-obs.rst +++ b/doc/source/install/compute-install-obs.rst @@ -59,7 +59,7 @@ authentication mechanism, message queue, and plug-in. [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 @@ -108,7 +108,7 @@ Configure the Compute service to use the Networking service [neutron] # ... url = http://controller:9696 - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/compute-install-rdo.rst b/doc/source/install/compute-install-rdo.rst index 85371514a67..981bf953695 100644 --- a/doc/source/install/compute-install-rdo.rst +++ b/doc/source/install/compute-install-rdo.rst @@ -62,7 +62,7 @@ authentication mechanism, message queue, and plug-in. [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 @@ -123,7 +123,7 @@ Configure the Compute service to use the Networking service [neutron] # ... url = http://controller:9696 - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-obs.rst b/doc/source/install/controller-install-obs.rst index 99b46e5aa14..4d55567ac95 100644 --- a/doc/source/install/controller-install-obs.rst +++ b/doc/source/install/controller-install-obs.rst @@ -248,7 +248,7 @@ Configure the Compute service to use the Networking service [neutron] # ... url = http://controller:9696 - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-option1-obs.rst b/doc/source/install/controller-install-option1-obs.rst index 14d7d6690f0..591572dffac 100644 --- a/doc/source/install/controller-install-option1-obs.rst +++ b/doc/source/install/controller-install-option1-obs.rst @@ -88,7 +88,7 @@ and plug-in. [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 @@ -120,7 +120,7 @@ and plug-in. [nova] # ... - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-option1-rdo.rst b/doc/source/install/controller-install-option1-rdo.rst index 1485f5ae5f1..f19f4a6f7ad 100644 --- a/doc/source/install/controller-install-option1-rdo.rst +++ b/doc/source/install/controller-install-option1-rdo.rst @@ -86,7 +86,7 @@ and plug-in. [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 @@ -118,7 +118,7 @@ and plug-in. [nova] # ... - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-option2-obs.rst b/doc/source/install/controller-install-option2-obs.rst index ccb3014bbc9..99a2dccbb70 100644 --- a/doc/source/install/controller-install-option2-obs.rst +++ b/doc/source/install/controller-install-option2-obs.rst @@ -87,7 +87,7 @@ Configure the server component [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 @@ -119,7 +119,7 @@ Configure the server component [nova] # ... - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-option2-rdo.rst b/doc/source/install/controller-install-option2-rdo.rst index 7aed0e121cd..d774f3b6756 100644 --- a/doc/source/install/controller-install-option2-rdo.rst +++ b/doc/source/install/controller-install-option2-rdo.rst @@ -85,7 +85,7 @@ Configure the server component [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 @@ -117,7 +117,7 @@ Configure the server component [nova] # ... - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst index 1e87fc90db6..352fa241b35 100644 --- a/doc/source/install/controller-install-rdo.rst +++ b/doc/source/install/controller-install-rdo.rst @@ -248,7 +248,7 @@ Configure the Compute service to use the Networking service [neutron] # ... url = http://controller:9696 - auth_url = http://controller:35357 + auth_url = http://controller:5000 auth_type = password project_domain_name = default user_domain_name = default