From 69a9a04ae3a92e7c227c33402b2769738b2746ca Mon Sep 17 00:00:00 2001
From: Christophe Sauthier <christophe.sauthier@objectif-libre.com>
Date: Wed, 8 Nov 2017 14:59:51 +0100
Subject: [PATCH] Fix documentation for missing auth_url.

Add the various sections in the documentation to fix missing auth_url errors.

Change-Id: If9beca3a6dd79428b0ef2195eafc277fb5586394
Closes-Bug: #1686617
---
 doc/source/install/compute-install-ubuntu.rst | 21 ++++++++++++++++
 .../install/controller-install-ubuntu.rst     | 25 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/doc/source/install/compute-install-ubuntu.rst b/doc/source/install/compute-install-ubuntu.rst
index f042f298e..78334805f 100644
--- a/doc/source/install/compute-install-ubuntu.rst
+++ b/doc/source/install/compute-install-ubuntu.rst
@@ -81,6 +81,27 @@ Install and configure components
      Replace ``ZUN_DBPASS`` with the password you chose for
      the zun database.
 
+   * In the ``[keystone_auth]`` section, configure
+     Identity service access:
+
+     .. code-block:: ini
+
+        [keystone_auth]
+        memcached_servers = controller:11211
+        auth_uri = http://controller:5000
+        project_domain_name = default
+        project_name = service
+        user_domain_name = default
+        password = ZUN_PASS
+        username = zun
+        auth_url = http://controller:35357
+        auth_type = password
+        auth_version = v3
+        auth_protocol = http
+        service_token_roles_required = True
+        endpoint_type = internalURL
+
+
    * In the ``[keystone_authtoken]`` section, configure
      Identity service access:
 
diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst
index a5d51390f..f1eee3c22 100644
--- a/doc/source/install/controller-install-ubuntu.rst
+++ b/doc/source/install/controller-install-ubuntu.rst
@@ -230,6 +230,27 @@ Install and configure components
      Replace ``ZUN_DBPASS`` with the password you chose for
      the zun database.
 
+   * In the ``[keystone_auth]`` section, configure
+     Identity service access:
+
+     .. code-block:: ini
+
+        [keystone_auth]
+        memcached_servers = controller:11211
+        auth_uri = http://controller:5000
+        project_domain_name = default
+        project_name = service
+        user_domain_name = default
+        password = ZUN_PASS
+        username = zun
+        auth_url = http://controller:35357
+        auth_type = password
+        auth_version = v3
+        auth_protocol = http
+        service_token_roles_required = True
+        endpoint_type = internalURL
+
+
    * In the ``[keystone_authtoken]`` section, configure
      Identity service access:
 
@@ -246,6 +267,10 @@ Install and configure components
         username = zun
         auth_url = http://controller:35357
         auth_type = password
+        auth_version = v3
+        auth_protocol = http
+        service_token_roles_required = True
+        endpoint_type = internalURL
 
      Replace ZUN_PASS with the password you chose for the zun user in the
      Identity service.