Merge "[install] Add the multiple domain configuration"

openstack · Feb 8, 2016 · 0bcbb6c · 0bcbb6c
2 parents bc97ea1 + 0e2337e
commit 0bcbb6c
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/doc/install-guide/source/horizon-install.rst b/doc/install-guide/source/horizon-install.rst
@@ -125,6 +125,22 @@ Install and configure components
 
            OPENSTACK_KEYSTONE_DEFAULT_ROLE = "user"
 
+      * Enable the multi-domain model:
+
+        .. code-block:: ini
+
+           OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True
+
+      * Configure the service API version so that you can log into
+        the dashboard by the Keystone V3 API:
+
+        .. code-block:: ini
+
+           OPENSTACK_API_VERSIONS = {
+               "identity": 3,
+               "volume": 2,
+           }
+
       * If you chose networking option 1, disable support for layer-3
         networking services:
 
@@ -193,6 +209,22 @@ Install and configure components
 
            OPENSTACK_KEYSTONE_DEFAULT_ROLE = "user"
 
+      * Enable the multi-domain model:
+
+        .. code-block:: ini
+
+           OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True
+
+      * Configure the service API version so that you can log into
+        the dashboard by the Keystone V3 API:
+
+        .. code-block:: ini
+
+           OPENSTACK_API_VERSIONS = {
+               "identity": 3,
+               "volume": 2,
+           }
+
       * If you chose networking option 1, disable support for layer-3
         networking services:
 
@@ -261,6 +293,22 @@ Install and configure components
 
            OPENSTACK_KEYSTONE_DEFAULT_ROLE = "user"
 
+      * Enable the multi-domain model:
+
+        .. code-block:: ini
+
+           OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True
+
+      * Configure the service API version so that you can log into
+        the dashboard by the Keystone V3 API:
+
+        .. code-block:: ini
+
+           OPENSTACK_API_VERSIONS = {
+               "identity": 3,
+               "volume": 2,
+           }
+
       * If you chose networking option 1, disable support for layer-3
         networking services:
 

diff --git a/doc/install-guide/source/horizon-verify.rst b/doc/install-guide/source/horizon-verify.rst
@@ -18,4 +18,5 @@ Verify operation of the dashboard.
    Access the dashboard using a web browser at
    ``http://controller/horizon``.
 
-Authenticate using ``admin`` or ``demo`` user credentials.
+Authenticate using ``admin`` or ``demo`` user
+and ``default`` domain credentials.