From cd642d2d4e67f60712bbbac87d81ecfcae292fbb Mon Sep 17 00:00:00 2001 From: Kristi Nikolla Date: Sat, 25 Feb 2017 15:37:09 -0500 Subject: [PATCH] Remove keystone.common.ldap Was deprecated in favor of keystone.identity.backends.ldap.common Change-Id: I73dddd539b41d089ed48546ff1fb114d5ebbbed2 Implements: bp removed-as-of-pike --- keystone/common/ldap/__init__.py | 26 ------------------- keystone/common/ldap/core.py | 26 ------------------- keystone/common/ldap/models.py | 26 ------------------- .../removed-as-of-pike-deadbeefdeadbeef.yaml | 5 ++++ 4 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 keystone/common/ldap/__init__.py delete mode 100644 keystone/common/ldap/core.py delete mode 100644 keystone/common/ldap/models.py diff --git a/keystone/common/ldap/__init__.py b/keystone/common/ldap/__init__.py deleted file mode 100644 index 7709e0011e..0000000000 --- a/keystone/common/ldap/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_log import versionutils - - -versionutils.deprecated( - what='keystone.common.ldap', - as_of=versionutils.deprecated.NEWTON, - remove_in=+2, - in_favor_of='keystone.identity.backends.ldap.common') - -# NOTE(notmorgan): This is maintained for compatibility in case outside -# developers are relying on this location. -from keystone.identity.backends.ldap.common import * # noqa diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py deleted file mode 100644 index 321492a400..0000000000 --- a/keystone/common/ldap/core.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_log import versionutils - - -versionutils.deprecated( - what='keystone.common.ldap.core', - as_of=versionutils.deprecated.NEWTON, - remove_in=+2, - in_favor_of='keystone.identity.backends.ldap.common') - -# NOTE(notmorgan): This is maintained for compatibility in case outside -# developers are relying on this location. -from keystone.identity.backends.ldap.common import * # noqa diff --git a/keystone/common/ldap/models.py b/keystone/common/ldap/models.py deleted file mode 100644 index 368e6df02e..0000000000 --- a/keystone/common/ldap/models.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2011 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from oslo_log import versionutils - - -versionutils.deprecated( - what='keystone.common.ldap.models', - as_of=versionutils.deprecated.NEWTON, - remove_in=+2, - in_favor_of='keystone.identity.backends.ldap.models') - -# NOTE(notmorgan): This is maintained for compatibility in case outside -# developers are relying on this location. -from keystone.identity.backends.ldap.models import * # noqa diff --git a/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml b/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml index c6fdf4ba59..e21a597f2c 100644 --- a/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml +++ b/releasenotes/notes/removed-as-of-pike-deadbeefdeadbeef.yaml @@ -26,3 +26,8 @@ other: value set to "true" in the user's ``options`` attribute (e.g. ``user['options']['ignore_password_expiry'] = True``) with a user update call. + - > + [`blueprint removed-as-of-pike `_] + The ``keystone.common.ldap`` module was removed from the code tree. It was + deprecated in the Newton release in favor of using + ``keystone.identity.backends.ldap.common`` which has the same functionality.