Add support for using Qpid instead of RabbitMQ.
To use Qpid instead of RabbitMQ, you set 'qpid' instead of 'rabbit' in
ENABLED_SERVICES in your localrc file. Otherwise, RabbitMQ is still
used by default.
(dtroyer) fixed problem with service test that failed to configure
rabbitmq if it was still selected.
Change-Id: I8c62b588a461a068463821b2c079ffa4bfa1f804
diff --git a/files/apts/nova b/files/apts/nova
index 8a3ca4c..3ebf57c 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -19,6 +19,7 @@
vlan
curl
rabbitmq-server # NOPRIME
+qpidd # NOPRIME
socat # used by ajaxterm
python-mox
python-paste
@@ -42,3 +43,4 @@
python-kombu
python-feedparser
python-iso8601
+python-qpid # dist:precise
diff --git a/files/rpms/nova b/files/rpms/nova
index 1b1d47f..bb92026 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -29,11 +29,13 @@
python-paramiko
python-paste
python-paste-deploy
+python-qpid
python-routes
python-sqlalchemy
python-suds
python-tempita
rabbitmq-server # NOPRIME
+qpid-cpp-server # NOPRIME
sqlite
sudo
vconfig