summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2017-07-05 21:59:11 +0900
committerAkihiro Motoki <amotoki@gmail.com>2017-07-05 21:59:11 +0900
commit39137dc8bef73dc23afbb7421c86b6947c12b4cb (patch)
tree7032d7057950fafcf2b3aa880bfd2b5f2f426193
parent50d18d50f198be0963f4fa524507a117a6f37ddb (diff)
Migrate settings on a feature merged recently
Recently the support for domain drop-down menu at login was merged into django_openstack_auth and the corresponding settings docs were merged into horizon. This commit migrates the settings docs from horizon as we recently moved django_openstack_auth settings into the in-tree docuemnt. Change-Id: Idc84a2535c1918079c6dcba09aef9110cf9be7df
Notes
Notes (review): Code-Review+2: Rob Cresswell <robert.cresswell@outlook.com> Workflow+1: Rob Cresswell <robert.cresswell@outlook.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 05 Jul 2017 13:16:49 +0000 Reviewed-on: https://review.openstack.org/480572 Project: openstack/django_openstack_auth Branch: refs/heads/master
-rw-r--r--doc/source/configuration/index.rst27
1 files changed, 27 insertions, 0 deletions
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index b442a3f..26c272b 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -98,6 +98,33 @@ with Keystone V3. All entities will be created in the default domain.
98 ``"cloud_admin": "rule:admin_required and domain_id:<your domain id>"``. 98 ``"cloud_admin": "rule:admin_required and domain_id:<your domain id>"``.
99 This value must be the name of the domain whose ID is specified there. 99 This value must be the name of the domain whose ID is specified there.
100 100
101``OPENSTACK_KEYSTONE_DOMAIN_CHOICES``
102-------------------------------------
103
104.. versionadded:: 12.0.0(Pike)
105
106Default::
107
108 (
109 ('Default', 'Default'),
110 )
111
112If OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN is enabled, this option can be used to
113set the available domains to choose from. This is a list of pairs whose first
114value is the domain name and the second is the display name.
115
116``OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN``
117--------------------------------------
118
119.. versionadded:: 12.0.0(Pike)
120
121Default: ``False``
122Set this to True if you want available domains displayed as a dropdown menu on
123the login screen. It is strongly advised NOT to enable this for public clouds,
124as advertising enabled domains to unauthenticated customers irresponsibly
125exposes private information. This should only be used for private clouds where
126the dashboard sits behind a corporate firewall.
127
101``OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT`` 128``OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT``
102------------------------------------------ 129------------------------------------------
103 130