openstack/devstack
Code Issues Proposed changes

Merge "The python-qpid packages must be installed when qpidd is configured"

Browse Source
This commit is contained in:
Jenkins 2014-09-18 05:27:49 +00:00 committed by Gerrit Code Review
commit 3454209005
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/apts/neutron
View File

@ -17,7 +17,7 @@ python-sqlalchemy
python-mysqldb python-mysqldb
python-mysql.connector python-mysql.connector
python-pyudev python-pyudev
python-qpid # dist:precise python-qpid # NOPRIME
dnsmasq-base dnsmasq-base
dnsmasq-utils # for dhcp_release only available in dist:precise dnsmasq-utils # for dhcp_release only available in dist:precise
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME

4
files/apts/nova
View File

@ -24,7 +24,7 @@ vlan
curl curl
genisoimage # required for config_drive genisoimage # required for config_drive
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME
qpidd # dist:precise NOPRIME qpidd # NOPRIME
socat # used by ajaxterm socat # used by ajaxterm
python-mox python-mox
python-paste python-paste
@ -45,4 +45,4 @@ python-m2crypto
python-kombu python-kombu
python-feedparser python-feedparser
python-iso8601 python-iso8601
python-qpid # dist:precise python-qpid # NOPRIME

2
files/rpms/neutron
View File

@ -15,7 +15,7 @@ python-kombu
#rhel6 gets via pip #rhel6 gets via pip
python-paste # dist:f19,f20,rhel7 python-paste # dist:f19,f20,rhel7
python-paste-deploy # dist:f19,f20,rhel7 python-paste-deploy # dist:f19,f20,rhel7
python-qpid python-qpid # NOPRIME
python-routes python-routes
python-sqlalchemy python-sqlalchemy
python-suds python-suds

2
files/rpms/nova
View File

@ -34,7 +34,7 @@ python-paramiko # dist:f19,f20,rhel7
# pip we need # pip we need
python-paste # dist:f19,f20,rhel7 python-paste # dist:f19,f20,rhel7
python-paste-deploy # dist:f19,f20,rhel7 python-paste-deploy # dist:f19,f20,rhel7
python-qpid python-qpid # NOPRIME
python-routes python-routes
python-sqlalchemy python-sqlalchemy
python-suds python-suds

5
lib/rpc_backend
View File

@ -182,6 +182,11 @@ EOF
sudo mkdir -p /var/run/openstack sudo mkdir -p /var/run/openstack
sudo chown $STACK_USER /var/run/openstack sudo chown $STACK_USER /var/run/openstack
fi 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 # restart the rpc backend