Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-fix-queue-name into lp:adt-cloud-worker

[Thomi Richards]

Add API version to queue name.

Add API version to a-c-w queue name.

[Celso Providelo (cprov)]

Thanks Thomi,

It looks like cloud-service is already declaring a versioned queue name, so only workers need production update.

Rabbit it so amazing that it even survived to our silliness and fanout requests from the exchange to both queues (due to the same topic/routing-queue):

{{{
$ sudo rabbitmqctl list_queues name messages consumers
Listing queues ...
adt.requests.amd64.nova 0 1
adt.requests.amd64.nova.v1 10 0
adt.requests.i386.nova 0 1
adt.results.v1 0 1
...done.
}}}

We better drop the versioned queue otherwise the new worker will replay test request and there will be a conflict trying to re-create the swift container.

The unversioned queues should also be removed because the will never be used again.

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-17 20:19:12 +0000
+++ adt_cloud_worker/__init__.py	2015-03-18 23:55:39 +0000
@@ -65,7 +65,7 @@
         exchange = kombu.Exchange("adt.exchange", type="topic")
         queues = [
             kombu.Queue(
-                'adt.requests.{}.nova'.format(arch),
+                'adt.requests.{}.nova.{}'.format(arch, API_VERSION),
                 exchange,
                 routing_key="{}.nova.{}".format(arch, API_VERSION)
             )