Modify RPM lists for RHEL6
Modifications to the RPM list to make devstack work on RHEL6. Makes
various packages only install on Fedora distros; generally letting pip
install the missing dependencies on RHEL.
Additionally the Qpid package name is different in RHEL6 to Fedora.
Also a small re-write of the config file is required to avoid
authenication issues.
Change-Id: If497099d27aa9cd80e1c1cee1aff2ed6b076d309
diff --git a/files/rpms/glance b/files/rpms/glance
index eff6c2c..34e3f9a 100644
--- a/files/rpms/glance
+++ b/files/rpms/glance
@@ -3,7 +3,7 @@
python-devel
python-eventlet
python-greenlet
-python-paste-deploy
+python-paste-deploy #dist:f16,f17,f18
python-routes
python-sqlalchemy
python-wsgiref
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 12f75ba..151e7e2 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -17,8 +17,8 @@
python-mox
python-netaddr
python-nose
-python-paste
-python-paste-deploy
+python-paste #dist:f16,f17,f18
+python-paste-deploy #dist:f16,f17,f18
python-pep8
python-routes
python-sphinx
diff --git a/files/rpms/keystone b/files/rpms/keystone
index 59868c7..078adf7 100644
--- a/files/rpms/keystone
+++ b/files/rpms/keystone
@@ -1,11 +1,13 @@
python-greenlet
-python-lxml
-python-paste
-python-paste-deploy
-python-paste-script
+python-lxml #dist:f16,f17,f18
+python-paste #dist:f16,f17,f18
+python-paste-deploy #dist:f16,f17,f18
+python-paste-script #dist:f16,f17,f18
python-routes
-python-setuptools
+python-setuptools #dist:f16,f17,f18
python-sqlalchemy
python-sqlite2
python-webob
sqlite
+
+# Deps installed via pip for RHEL
\ No newline at end of file
diff --git a/files/rpms/nova b/files/rpms/nova
index 7ff926b..b8c8528 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -28,9 +28,11 @@
python-migrate
python-mox
python-netaddr
-python-paramiko
-python-paste
-python-paste-deploy
+python-paramiko # dist:f16,f17,f18
+# ^ on RHEL, brings in python-crypto which conflicts with version from
+# pip we need
+python-paste # dist:f16,f17,f18
+python-paste-deploy # dist:f16,f17,f18
python-qpid
python-routes
python-sqlalchemy
diff --git a/files/rpms/quantum b/files/rpms/quantum
index 05398fc..450e39c 100644
--- a/files/rpms/quantum
+++ b/files/rpms/quantum
@@ -10,14 +10,16 @@
python-iso8601
python-kombu
python-netaddr
-python-paste
-python-paste-deploy
+#rhel6 gets via pip
+python-paste # dist:f16,f17,f18
+python-paste-deploy # dist:f16,f17,f18
python-qpid
python-routes
python-sqlalchemy
python-suds
rabbitmq-server # NOPRIME
-qpid-cpp-server-daemon # NOPRIME
+qpid-cpp-server-daemon # NOPRIME dist:f16,f17,f18
+qpid-cpp-server # NOPRIME dist:rhel6
sqlite
sudo
vconfig
diff --git a/files/rpms/ryu b/files/rpms/ryu
index 4a4fc52..7cf3bd7 100644
--- a/files/rpms/ryu
+++ b/files/rpms/ryu
@@ -1,5 +1,5 @@
-python-setuptools
python-gevent
python-gflags
python-netifaces
+python-setuptools #dist:f16,f17,f18
python-sphinx
diff --git a/files/rpms/swift b/files/rpms/swift
index ce41ceb..1b36e34 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -8,8 +8,8 @@
python-greenlet
python-netifaces
python-nose
-python-paste-deploy
-python-setuptools
+python-paste-deploy # dist:f16,f17,f18
+python-setuptools # dist:f16,f17,f18
python-simplejson
python-webob
pyxattr
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 7d165a4..1edea15 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -57,7 +57,11 @@
fi
elif is_service_enabled qpid; then
if is_fedora; then
- uninstall_package qpid-cpp-server-daemon
+ if [[ $DISTRO =~ (rhel6) ]]; then
+ uninstall_package qpid-cpp-server
+ else
+ uninstall_package qpid-cpp-server-daemon
+ fi
elif is_ubuntu; then
uninstall_package qpidd
else
@@ -87,7 +91,16 @@
rm -f "$tfile"
elif is_service_enabled qpid; then
if is_fedora; then
- install_package qpid-cpp-server-daemon
+ 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
sudo sed -i '/PLAIN/!s/mech_list: /mech_list: PLAIN /' /etc/sasl2/qpidd.conf