From 6582517c4a48e134d2ed982d23c49d89560fb05a Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 4 Jun 2012 13:35:21 -0400
Subject: [PATCH] Prefix all nova binaries with 'nova-'.

Fixes LP Bug #1008625.

Change-Id: I2b0dc97133b3039818a52e0b8456dc31cdbd714e
---
 bin/{clear_rabbit_queues => nova-clear-rabbit-queues}   | 0
 bin/{instance-usage-audit => nova-instance-usage-audit} | 0
 bin/{volume-usage-audit => nova-volume-usage-audit}     | 0
 setup.py                                                | 8 ++++----
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename bin/{clear_rabbit_queues => nova-clear-rabbit-queues} (100%)
 rename bin/{instance-usage-audit => nova-instance-usage-audit} (100%)
 rename bin/{volume-usage-audit => nova-volume-usage-audit} (100%)

diff --git a/bin/clear_rabbit_queues b/bin/nova-clear-rabbit-queues
similarity index 100%
rename from bin/clear_rabbit_queues
rename to bin/nova-clear-rabbit-queues
diff --git a/bin/instance-usage-audit b/bin/nova-instance-usage-audit
similarity index 100%
rename from bin/instance-usage-audit
rename to bin/nova-instance-usage-audit
diff --git a/bin/volume-usage-audit b/bin/nova-volume-usage-audit
similarity index 100%
rename from bin/volume-usage-audit
rename to bin/nova-volume-usage-audit
diff --git a/setup.py b/setup.py
index 929223f25e..f71312dfc7 100644
--- a/setup.py
+++ b/setup.py
@@ -72,26 +72,26 @@ setuptools.setup(name='nova',
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
-      scripts=['bin/clear_rabbit_queues',
-               'bin/instance-usage-audit',
-               'bin/nova-all',
+      scripts=['bin/nova-all',
                'bin/nova-api',
                'bin/nova-api-ec2',
                'bin/nova-api-metadata',
                'bin/nova-api-os-compute',
                'bin/nova-api-os-volume',
                'bin/nova-cert',
+               'bin/nova-clear-rabbit-queues',
                'bin/nova-compute',
                'bin/nova-console',
                'bin/nova-consoleauth',
                'bin/nova-dhcpbridge',
+               'bin/nova-instance-usage-audit',
                'bin/nova-manage',
                'bin/nova-network',
                'bin/nova-objectstore',
                'bin/nova-rootwrap',
                'bin/nova-scheduler',
                'bin/nova-volume',
+               'bin/nova-volume-usage-audit',
                'bin/nova-xvpvncproxy',
-               'bin/volume-usage-audit',
               ],
         py_modules=[])