From d8e0ab3e357dc7cb67d094c2d14ef39562d19d67 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 24 Feb 2017 15:20:02 +1100 Subject: [PATCH] Fix doc confusion around AVAILABLE_REGIONS/OPENSTACK_KEYSTONE_URL The docs erroneously indicate that OPENSTACK_KEYSTONE_URL should not be set when AVAILABLE_REGIONS is used, but it actually should be. Change-Id: I2bd55b1c7e41c14a2624aadd8d32acdae5753839 Closes-Bug: 1667557 (cherry picked from commit 4c03d5cf9a017ff2eec504e2ab25403403c03aa7) --- doc/source/topics/settings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/topics/settings.rst b/doc/source/topics/settings.rst index ee537f78ef..b2a754d70d 100644 --- a/doc/source/topics/settings.rst +++ b/doc/source/topics/settings.rst @@ -360,8 +360,8 @@ are specified the login form will have a dropdown selector for authenticating to the appropriate region, and there will be a region switcher dropdown in the site header when logged in. -If you do not have multiple regions you should use the ``OPENSTACK_HOST`` and -``OPENSTACK_KEYSTONE_URL`` settings instead. +You should also define ``OPENSTACK_KEYSTONE_URL`` to indicate which of +the regions is the default one. ``CONSOLE_TYPE``