@@ -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

@@ -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

@@ -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

@@ -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

@@ -182,6 +182,11 @@ EOF

         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