From d453def814dbfd41be8060712124b910b9484dae Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 15 Mar 2012 14:25:52 -0700 Subject: [PATCH] Remove glance-cache-queue-image * bin/glance-cache-queue-image duplicates functionality provided by bin/ glance-cache-manage, and it is currently broken. Let's just remove it. Change-Id: Ib18be2116055154047df6ca9b4c335323c8b2dde --- bin/glance-cache-queue-image | 52 -------------- doc/source/cache.rst | 10 --- doc/source/conf.py | 2 - doc/source/man/glancecachequeueimage.rst | 87 ------------------------ setup.py | 1 - 5 files changed, 152 deletions(-) delete mode 100755 bin/glance-cache-queue-image delete mode 100644 doc/source/man/glancecachequeueimage.rst diff --git a/bin/glance-cache-queue-image b/bin/glance-cache-queue-image deleted file mode 100755 index 2bfd68709e..0000000000 --- a/bin/glance-cache-queue-image +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack LLC. -# 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. - -""" -CLI Utility to queue one or more images for prefetching into the image cache -""" - -import gettext -import os -import sys - -# If ../glance/__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, 'glance', '__init__.py')): - sys.path.insert(0, possible_topdir) - -gettext.install('glance', unicode=1) - -from glance.common import config - -USAGE = """ -%%prog [OPTIONS] [ ... ] -""" - - -if __name__ == '__main__': - try: - conf = config.GlanceCacheConfigOpts(usage=USAGE) - args = conf() - - app = config.load_paste_app(conf, 'glance-queue-image') - app.run(args) - except RuntimeError, e: - sys.exit("ERROR: %s" % e) diff --git a/doc/source/cache.rst b/doc/source/cache.rst index 60c7a8f086..ca3a3c90d7 100644 --- a/doc/source/cache.rst +++ b/doc/source/cache.rst @@ -85,16 +85,6 @@ To queue an image for prefetching, you can use one of the following methods: This will queue the image with identifier ```` for prefetching - * You may use the ``glance-cache-queue-image`` executable, supplying a list - of image identifiers to queue for prefetching into the cache. - - Example usage:: - - $> glance-cache-queue-image 12345 ABCDE - - would queue the images with identifiers ``12345`` and ``ABCDE`` for - prefetching. - Once you have queued the images you wish to prefetch, call the ``glance-cache-prefetcher`` executable, which will prefetch all queued images concurrently, logging the results of the fetch for each image. diff --git a/doc/source/conf.py b/doc/source/conf.py index b374e6f9f2..a6a3c355e1 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -135,8 +135,6 @@ man_pages = [ u'Glance Cache Pre-fetcher', [u'OpenStack'], 1), ('man/glancecachepruner', 'glance-cache-pruner', u'Glance Cache Pruner', [u'OpenStack'], 1), - ('man/glancecachequeueimage', 'glance-cache-queue-image', - u'Glance Cache Queue Image', [u'OpenStack'], 1), ('man/glancecontrol', 'glance-control', u'Glance Daemon Control Helper ', [u'OpenStack'], 1), ('man/glancemanage', 'glance-manage', u'Glance Management Utility', diff --git a/doc/source/man/glancecachequeueimage.rst b/doc/source/man/glancecachequeueimage.rst deleted file mode 100644 index 84bba176c9..0000000000 --- a/doc/source/man/glancecachequeueimage.rst +++ /dev/null @@ -1,87 +0,0 @@ -======================== -glance-cache-queue-image -======================== - ----------------------------- -Queue images for prefetching ----------------------------- - -:Author: glance@lists.launchpad.net -:Date: 2012-01-03 -:Copyright: OpenStack LLC -:Version: 2012.1-dev -:Manual section: 1 -:Manual group: cloud computing - -SYNOPSIS -======== - - glance-cache-queue-image [OPTIONS] [ ... ] - -OPTIONS -======= - - **--version** - show program's version number and exit - - **-h, --help** - show this help message and exit - - **--config-file=PATH** - Path to a config file to use. Multiple config files - can be specified, with values in later files taking - precedence. The default files used are: [] - - **-d, --debug** - Print debugging output - - **--nodebug** - Do not print debugging output - - **-v, --verbose** - Print more verbose output - - **--noverbose** - Do not print more verbose output - - **--log-config=PATH** - If this option is specified, the logging configuration - file specified is used and overrides any other logging - options specified. Please see the Python logging - module documentation for details on logging - configuration files. - - **--log-format=FORMAT** - A logging.Formatter log message format string which - may use any of the available logging.LogRecord - attributes. Default: none - - **--log-date-format=DATE_FORMAT** - Format string for %(asctime)s in log records. Default: none - - **--log-file=PATH** - (Optional) Name of log file to output to. If not set, - logging will go to stdout. - - **--log-dir=LOG_DIR** - (Optional) The directory to keep log files in (will be - prepended to --logfile) - - **--use-syslog** - Use syslog for logging. - - **--nouse-syslog** - Do not use syslog for logging. - - **--syslog-log-facility=SYSLOG_LOG_FACILITY** - syslog facility to receive log lines - -SEE ALSO -======== - -* `OpenStack Glance `__ - -BUGS -==== - -* Glance is sourced in Launchpad so you can view current bugs at `OpenStack Glance `__ diff --git a/setup.py b/setup.py index ead7972fcc..b249895f11 100644 --- a/setup.py +++ b/setup.py @@ -108,7 +108,6 @@ setup( 'bin/glance-api', 'bin/glance-cache-prefetcher', 'bin/glance-cache-pruner', - 'bin/glance-cache-queue-image', 'bin/glance-cache-manage', 'bin/glance-cache-cleaner', 'bin/glance-control',