Merge "Deprecate [federation] federated_domain_name"
This commit is contained in:
commit
a16b6f700e
|
@ -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
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
[`bug 1829454 <https://bugs.launchpad.net/keystone/+bug/1829454>`_]
|
||||
The `[federation] federated_domain_name` option is deprecated. All users
|
||||
live in the identity provider's domain now, and the option is no longer
|
||||
used.
|
Loading…
Reference in New Issue