From efa31ef03de39103779feb725fac1c3e08c851fc Mon Sep 17 00:00:00 2001 From: Thang Pham Date: Fri, 25 Jul 2014 21:02:07 -0400 Subject: [PATCH] Remove cinder-clear-rabbit-queues cinder-clear-rabbit-queues should be removed because it does not appear to be widely used and there is no user documentation for it. Also, RabbitMQ now includes a management plugin and CLI, rabbitmqadmin, that allows you to delete queues and exchanges. This script was also removed in nova as part of https://review.openstack.org/#/c/40355/. DocImpact: The RabbitMQ management plugin ships with rabbitmqadmin. It supports RabbitMQ version 2.8.x and above. Closes-Bug: #1348859 Change-Id: I77bb54065280771e5cc64835af9c584626ecf8b8 --- bin/cinder-clear-rabbit-queues | 77 ---------------------------------- setup.cfg | 1 - 2 files changed, 78 deletions(-) delete mode 100755 bin/cinder-clear-rabbit-queues diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues deleted file mode 100755 index 2328b2bef..000000000 --- a/bin/cinder-clear-rabbit-queues +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2011 OpenStack Foundation -# 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. - -"""Admin/debug script to wipe rabbitMQ (AMQP) queues cinder uses. - This can be used if you need to change durable options on queues, - or to wipe all messages in the queue system if things are in a - serious bad way. - -""" - -import os -import sys -import warnings - -warnings.simplefilter('once', DeprecationWarning) - -from oslo.config import cfg - -# If ../cinder/__init__.py exists, add ../ to Python search path, so that -# it will override what happens to be installed in /usr/(local/)lib/python... -POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), - os.pardir, - os.pardir)) -if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): - sys.path.insert(0, POSSIBLE_TOPDIR) - -from cinder.openstack.common import gettextutils -gettextutils.enable_lazy() - -# Need to register global_opts -from cinder.common import config # noqa -from cinder.openstack.common import log as logging -from cinder.openstack.common import rpc -from cinder import version - - -delete_exchange_opt = \ - cfg.BoolOpt('delete_exchange', - default=False, - help='delete cinder exchange too.') - -CONF = cfg.CONF -CONF.register_cli_opt(delete_exchange_opt) - - -def delete_exchange(exch): - conn = rpc.create_connection() - x = conn.get_channel() - x.exchange_delete(exch) - - -def delete_queues(queues): - conn = rpc.create_connection() - x = conn.get_channel() - for q in queues: - x.queue_delete(q) - -if __name__ == '__main__': - args = CONF(sys.argv[1:], project='cinder', - version=version.version_string()) - logging.setup("cinder") - delete_queues(args[1:]) - if CONF.delete_exchange: - delete_exchange(CONF.control_exchange) diff --git a/setup.cfg b/setup.cfg index 82d201f19..57fb4f05b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,6 @@ scripts = bin/cinder-all bin/cinder-api bin/cinder-backup - bin/cinder-clear-rabbit-queues bin/cinder-manage bin/cinder-rpc-zmq-receiver bin/cinder-rtstool -- 2.45.2