openstack/devstack
Code Issues Proposed changes

Update the package name of qpid in the fedora platform

Browse Source 
The package name of qpid in default yum repository
is qpid-cpp-server, not qpid-cpp-server-daemon.

Fix bug 1177731

Change-Id: I4412029966583f5ef5a5a4cc80e7fdc4771c8eca
This commit is contained in:
zhhuabj 2013-05-08 18:27:20 +08:00
parent b240ad472b
commit 5595fdc2ac
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/rpms/nova
View File

@ -40,7 +40,7 @@ python-sqlalchemy
python-suds
python-tempita
rabbitmq-server # NOPRIME
qpid-cpp-server-daemon # NOPRIME
qpid-cpp-server # NOPRIME
sqlite
sudo
vconfig

3
files/rpms/quantum
View File

@ -18,8 +18,7 @@ python-routes
python-sqlalchemy
python-suds
rabbitmq-server # NOPRIME
qpid-cpp-server-daemon # NOPRIME dist:f16,f17,f18
qpid-cpp-server # NOPRIME dist:rhel6
qpid-cpp-server # NOPRIME
sqlite
sudo
vconfig

11
lib/rpc_backend
View File

@ -70,11 +70,7 @@ function cleanup_rpc_backend {
fi
elif is_service_enabled qpid; then
if is_fedora; then
if [[ $DISTRO =~ (rhel6) ]]; then
uninstall_package qpid-cpp-server
else
uninstall_package qpid-cpp-server-daemon
fi
uninstall_package qpid-cpp-server
elif is_ubuntu; then
uninstall_package qpidd
else
@ -104,15 +100,12 @@ function install_rpc_backend() {
rm -f "$tfile"
elif is_service_enabled qpid; then
if is_fedora; then
install_package qpid-cpp-server
if [[ $DISTRO =~ (rhel6) ]]; then
install_package qpid-cpp-server
# RHEL6 leaves "auth=yes" in /etc/qpidd.conf, it needs to
# be no or you get GSS authentication errors as it
# attempts to default to this.
sudo sed -i.bak 's/^auth=yes$/auth=no/' /etc/qpidd.conf
else
install_package qpid-cpp-server-daemon
fi
elif is_ubuntu; then
install_package qpidd