From 61ece29d59526b42b8d3b44bacf7595a3dd7e42d Mon Sep 17 00:00:00 2001
From: qiaomin <chen.qiaomin@99cloud.net>
Date: Sat, 12 May 2018 23:53:09 +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 install guide to reflect that change.

Change-Id: Ie8f0236fdaa1caab666f7b1dd15f29f74774435c
---
 devstack/lib/tacker                                       | 2 +-
 doc/source/_extra/tacker.conf.sample                      | 2 +-
 doc/source/contributor/encrypt_vim_auth_with_barbican.rst | 2 +-
 doc/source/install/manual_installation.rst                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/lib/tacker b/devstack/lib/tacker
index c70c6c09f..85ce98e5a 100644
--- a/devstack/lib/tacker
+++ b/devstack/lib/tacker
@@ -223,7 +223,7 @@ function configure_tacker {
         iniset $TACKER_CONF alarm_auth username admin
         iniset $TACKER_CONF alarm_auth password "$ADMIN_PASSWORD"
         iniset $TACKER_CONF alarm_auth project_name admin
-        iniset $TACKER_CONF alarm_auth url http://$SERVICE_HOST:35357/v3
+        iniset $TACKER_CONF alarm_auth url http://$SERVICE_HOST:5000/v3
 
         echo "Creating bridge"
         sudo ovs-vsctl --may-exist add-br ${BR_MGMT}
diff --git a/doc/source/_extra/tacker.conf.sample b/doc/source/_extra/tacker.conf.sample
index c15701e77..fd61763f1 100644
--- a/doc/source/_extra/tacker.conf.sample
+++ b/doc/source/_extra/tacker.conf.sample
@@ -431,7 +431,7 @@ transport_url = rabbit://stackrabbit:devstack@127.0.0.1:5672/
 
 
 [alarm_auth]
-url = http://127.0.0.1:35357/v3
+url = http://127.0.0.1:5000/v3
 project_name = admin
 password = devstack
 username = admin
diff --git a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
index d53b5ddf1..b9056b94a 100644
--- a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
+++ b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
@@ -63,7 +63,7 @@ Create a vim and verify it works:
    export OS_PROJECT_NAME=test
    export OS_USER_DOMAIN_NAME=Default
    export OS_PROJECT_DOMAIN_NAME=Default
-   export OS_AUTH_URL=http://127.0.0.1:35357/v3
+   export OS_AUTH_URL=http://127.0.0.1:5000/v3
    export OS_IDENTITY_API_VERSION=3
    export OS_IMAGE_API_VERSION=2
    export OS_NETWORK_API_VERSION=2
diff --git a/doc/source/install/manual_installation.rst b/doc/source/install/manual_installation.rst
index 0a387ac4e..dd446c3c4 100644
--- a/doc/source/install/manual_installation.rst
+++ b/doc/source/install/manual_installation.rst
@@ -44,7 +44,7 @@ is like the below:
     export OS_TENANT_NAME=admin
     export OS_USERNAME=admin
     export OS_PASSWORD=KTskN5eUMTpeHLKorRcZBBbH0AM96wdvgQhwENxY
-    export OS_AUTH_URL=http://localhost:35357/v3
+    export OS_AUTH_URL=http://localhost:5000/v3
     export OS_INTERFACE=internal
     export OS_IDENTITY_API_VERSION=3
     export OS_REGION_NAME=RegionOne
@@ -213,7 +213,7 @@ If you are using keystone v2 then,
    username = <TACKER_USER_NAME>
    project_name = service
    password = <TACKER_SERVICE_USER_PASSWORD>
-   auth_url = http://<KEYSTONE_IP>:35357
+   auth_url = http://<KEYSTONE_IP>:5000
    www_authenticate_uri = http://<KEYSTONE_IP>:5000
    ...