Update the package name of qpid in the fedora platform
The package name of qpid in default yum repository
is qpid-cpp-server, not qpid-cpp-server-daemon.
Fix bug 1177731
Change-Id: I4412029966583f5ef5a5a4cc80e7fdc4771c8eca
diff --git a/files/rpms/nova b/files/rpms/nova
index 328e7d6..c74f396 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -40,7 +40,7 @@
python-suds
python-tempita
rabbitmq-server # NOPRIME
-qpid-cpp-server-daemon # NOPRIME
+qpid-cpp-server # NOPRIME
sqlite
sudo
vconfig
diff --git a/files/rpms/quantum b/files/rpms/quantum
index 450e39c..32c6f62 100644
--- a/files/rpms/quantum
+++ b/files/rpms/quantum
@@ -18,8 +18,7 @@
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
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 3c485e4..27d3ba3 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -70,11 +70,7 @@
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 @@
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