From 0ae1ad63c10ea8643fc0998dca159b844286c414 Mon Sep 17 00:00:00 2001 From: zengjia Date: Wed, 10 Jul 2019 15:46:32 +0800 Subject: [PATCH] Update auth_url in install docs Beginning with the Queens release, the keystone install guide recommends running all interfaces on the same port.This patch updates the swift install guide to reflect that change Change-Id: Id00cfd2c921da352abdbbbb6668b921f3cb31a1a Closes-bug: #1754104 --- doc/manpages/proxy-server.conf.5 | 2 +- doc/source/install/controller-include.txt | 2 +- doc/source/overview_auth.rst | 2 +- etc/proxy-server.conf-sample | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5 index e9e9a9d4dc..942bcac92a 100644 --- a/doc/manpages/proxy-server.conf.5 +++ b/doc/manpages/proxy-server.conf.5 @@ -305,7 +305,7 @@ for other examples. .RS 10 .IP "paste.filter_factory = keystonemiddleware.auth_token:filter_factory" .IP "www_authenticate_uri = http://keystonehost:5000" -.IP "auth_url = http://keystonehost:35357" +.IP "auth_url = http://keystonehost:5000" .IP "auth_plugin = password" .IP "project_domain_id = default" .IP "user_domain_id = default" diff --git a/doc/source/install/controller-include.txt b/doc/source/install/controller-include.txt index 779b2fa7e9..ec6b37a270 100644 --- a/doc/source/install/controller-include.txt +++ b/doc/source/install/controller-include.txt @@ -56,7 +56,7 @@ following actions: paste.filter_factory = keystonemiddleware.auth_token:filter_factory ... 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_id = default diff --git a/doc/source/overview_auth.rst b/doc/source/overview_auth.rst index ac0005ec2e..59a42fb75e 100644 --- a/doc/source/overview_auth.rst +++ b/doc/source/overview_auth.rst @@ -139,7 +139,7 @@ add the configuration for the authtoken middleware:: [filter:authtoken] paste.filter_factory = keystonemiddleware.auth_token:filter_factory www_authenticate_uri = http://keystonehost:5000/ - auth_url = http://keystonehost:35357/ + auth_url = http://keystonehost:5000/ auth_plugin = password project_domain_id = default user_domain_id = default diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index bffa2391a5..31788be1a8 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -380,7 +380,7 @@ user_test5_tester5 = testing5 service # [filter:authtoken] # paste.filter_factory = keystonemiddleware.auth_token:filter_factory # www_authenticate_uri = http://keystonehost:5000 -# auth_url = http://keystonehost:35357 +# auth_url = http://keystonehost:5000 # auth_plugin = password # The following credentials must match the Keystone credentials for the Swift # service and may need to be changed to match your Keystone configuration. The @@ -591,7 +591,7 @@ delay_auth_decision = False # Keystone server details. Note that this differs from how swift3 was # configured: in particular, the Keystone API version must be included. -auth_uri = http://keystonehost:35357/v3 +auth_uri = http://keystonehost:5000/v3 # Connect/read timeout to use when communicating with Keystone http_timeout = 10.0 @@ -610,7 +610,7 @@ http_timeout = 10.0 # Secret caching requires Keystone credentials similar to the authtoken middleware; # these credentials require access to view all project credentials. -# auth_url = http://keystonehost:35357 +# auth_url = http://keystonehost:5000 # auth_type = password # project_domain_id = default # project_name = service