From a1875b7b67f26f0bb1e82ef8f31c3181e630b34b Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@gmail.com>
Date: Mon, 15 Sep 2014 14:21:55 -0400
Subject: [PATCH] The python-qpid packages must be installed when qpidd is
 configured

The python-qpid package is available for Ubuntu trusty, precise, and
all the supported RHEL based platforms.  This package is necessary if
qpidd is configured as the RPC backend.  It is the client API used to
talk to the broker, and must be installed on each system that
communicates with the broker.

Change-Id: I635d3e857aa4b769a80cb7cde405cfd6cae44d32
---
 files/apts/neutron | 2 +-
 files/apts/nova    | 4 ++--
 files/rpms/neutron | 2 +-
 files/rpms/nova    | 2 +-
 lib/rpc_backend    | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/files/apts/neutron b/files/apts/neutron
index 9df5904c56..381c75836d 100644
--- a/files/apts/neutron
+++ b/files/apts/neutron
@@ -17,7 +17,7 @@ python-sqlalchemy
 python-mysqldb
 python-mysql.connector
 python-pyudev
-python-qpid # dist:precise
+python-qpid # NOPRIME
 dnsmasq-base
 dnsmasq-utils # for dhcp_release only available in dist:precise
 rabbitmq-server # NOPRIME
diff --git a/files/apts/nova b/files/apts/nova
index 4e47d70f5f..b1b969aab7 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -24,7 +24,7 @@ vlan
 curl
 genisoimage # required for config_drive
 rabbitmq-server # NOPRIME
-qpidd # dist:precise NOPRIME
+qpidd # NOPRIME
 socat # used by ajaxterm
 python-mox
 python-paste
@@ -45,4 +45,4 @@ python-m2crypto
 python-kombu
 python-feedparser
 python-iso8601
-python-qpid # dist:precise
+python-qpid # NOPRIME
diff --git a/files/rpms/neutron b/files/rpms/neutron
index 29d5cea34a..7020d33719 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -15,7 +15,7 @@ python-kombu
 #rhel6 gets via pip
 python-paste        # dist:f19,f20,rhel7
 python-paste-deploy # dist:f19,f20,rhel7
-python-qpid
+python-qpid # NOPRIME
 python-routes
 python-sqlalchemy
 python-suds
diff --git a/files/rpms/nova b/files/rpms/nova
index fab450403e..695d814f7d 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -34,7 +34,7 @@ python-paramiko # dist:f19,f20,rhel7
 # pip we need
 python-paste        # dist:f19,f20,rhel7
 python-paste-deploy # dist:f19,f20,rhel7
-python-qpid
+python-qpid # NOPRIME
 python-routes
 python-sqlalchemy
 python-suds
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 38da50c4f8..f70f98c2e7 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -130,6 +130,11 @@ function install_rpc_backend {
         sudo mkdir -p /var/run/openstack
         sudo chown $STACK_USER /var/run/openstack
     fi
+
+    # If using the QPID broker, install the QPID python client API
+    if is_service_enabled qpid || [ -n "$QPID_HOST" ]; then
+        install_package python-qpid
+    fi
 }
 
 # restart the rpc backend