summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2013-03-25 16:37:39 -0400
committerJoe Gordon <jogo@cloudscaling.com>2013-03-25 17:15:22 -0400
commitd7ae4ff11c7ef543c6b717952f98de236fa20d96 (patch)
treef9f0b7e582d54ba901d9aa164dc0353122f4c362 /openstack
parent575e74d352d685773513218a286979bb58920246 (diff)
downloadoslo-d7ae4ff11c7ef543c6b717952f98de236fa20d96.tar.gz
oslo-d7ae4ff11c7ef543c6b717952f98de236fa20d96.tar.xz
oslo-d7ae4ff11c7ef543c6b717952f98de236fa20d96.zip
Remove deprecated Grizzly features
Now that Havana has started, remove deprecated Grizzly features * deprecated alias list_notifier_drivers (for notification_driver) * openstack/common/notifier/rabbit_notifier.py (use rpc_notifier instead) Change-Id: I0dbb997ba774f58766bddf950049ec1e2d5b79de
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/notifier/api.py1
-rw-r--r--openstack/common/notifier/rabbit_notifier.py29
2 files changed, 0 insertions, 30 deletions
diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py
index 0b18df6..13ac394 100644
--- a/openstack/common/notifier/api.py
+++ b/openstack/common/notifier/api.py
@@ -30,7 +30,6 @@ LOG = logging.getLogger(__name__)
notifier_opts = [
cfg.MultiStrOpt('notification_driver',
default=[],
- deprecated_name='list_notifier_drivers',
help='Driver or drivers to handle sending notifications'),
cfg.StrOpt('default_notification_level',
default='INFO',
diff --git a/openstack/common/notifier/rabbit_notifier.py b/openstack/common/notifier/rabbit_notifier.py
deleted file mode 100644
index 56a37e4..0000000
--- a/openstack/common/notifier/rabbit_notifier.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# All Rights Reserved.
-#
-# 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 openstack.common.gettextutils import _
-from openstack.common import log as logging
-from openstack.common.notifier import rpc_notifier
-
-LOG = logging.getLogger(__name__)
-
-
-def notify(context, message):
- """Deprecated in Grizzly. Please use rpc_notifier instead."""
-
- LOG.deprecated(_("The rabbit_notifier is now deprecated."
- " Please use rpc_notifier instead."))
- rpc_notifier.notify(context, message)