summaryrefslogtreecommitdiff
path: root/keystone/conf
diff options
context:
space:
mode:
authorKristi Nikolla <kristi@nikolla.me>2019-04-10 13:19:57 -0400
committerKristi Nikolla <kristi@nikolla.me>2019-07-16 19:31:31 +0000
commitd78ac78395e05bbcce6674d7150e8ec25c3a558e (patch)
tree80d7d71ca5b5e4b8e0e1b1ff073beec3bfa087fb /keystone/conf
parent3d2b293d7edfb0bd4bdec9b33abc63d1308e10bd (diff)
downloadkeystone-d78ac78395e05bbcce6674d7150e8ec25c3a558e.tar.gz
Deprecate [federation] federated_domain_name
Prior to introducing per idp domains, all ephemeral users lived in the Federated domain. That is not the case anymore, since they now live in the domain of the idp. Change-Id: Ife501adf7b122d2c987e132dbfafe0717760c1bb Partial-Bug: 1754048 Partial-Bug: 1829454
Diffstat (limited to 'keystone/conf')
-rw-r--r--keystone/conf/federation.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/keystone/conf/federation.py b/keystone/conf/federation.py
index fa3d57df5..5f1a7a5b9 100644
--- a/keystone/conf/federation.py
+++ b/keystone/conf/federation.py
@@ -11,10 +11,16 @@
# under the License.
from oslo_config import cfg
+from oslo_log import versionutils
from keystone.conf import utils
+_DEPRECATED_MSG = utils.fmt("""
+This option has been superseded by ephemeral users existing in the domain
+of their identity provider.
+""")
+
driver = cfg.StrOpt(
'driver',
default='sql',
@@ -44,6 +50,9 @@ could be `MELLON_IDP`.
federated_domain_name = cfg.StrOpt(
'federated_domain_name',
default='Federated',
+ deprecated_for_removal=True,
+ deprecated_reason=_DEPRECATED_MSG,
+ deprecated_since=versionutils.deprecated.TRAIN,
help=utils.fmt("""
An arbitrary domain name that is reserved to allow federated ephemeral users to
have a domain concept. Note that an admin will not be able to create a domain