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

files/rpms/glance

@@ -3,7 +3,7 @@ python-argparse
 python-devel
 python-eventlet
 python-greenlet
-python-paste-deploy
+python-paste-deploy #dist:f16,f17,f18
 python-routes
 python-sqlalchemy
 python-wsgiref

files/rpms/horizon

@@ -17,8 +17,8 @@ python-migrate
 python-mox
 python-netaddr
 python-nose
-python-paste
+python-paste        #dist:f16,f17,f18
-python-paste-deploy
+python-paste-deploy #dist:f16,f17,f18
 python-pep8
 python-routes
 python-sphinx

files/rpms/keystone

@@ -1,11 +1,13 @@
 python-greenlet
-python-lxml
+python-lxml         #dist:f16,f17,f18
-python-paste
+python-paste        #dist:f16,f17,f18
-python-paste-deploy
+python-paste-deploy #dist:f16,f17,f18
-python-paste-script
+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

files/rpms/nova

@@ -28,9 +28,11 @@ python-lockfile
 python-migrate
 python-mox
 python-netaddr
-python-paramiko
+python-paramiko # dist:f16,f17,f18
-python-paste
+# ^ on RHEL, brings in python-crypto which conflicts with version from
-python-paste-deploy
+# pip we need
+python-paste        # dist:f16,f17,f18
+python-paste-deploy # dist:f16,f17,f18
 python-qpid
 python-routes
 python-sqlalchemy

files/rpms/quantum

@@ -10,14 +10,16 @@ python-greenlet
 python-iso8601
 python-kombu
 python-netaddr
-python-paste
+#rhel6 gets via pip
-python-paste-deploy
+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

files/rpms/ryu

@@ -1,5 +1,5 @@
-python-setuptools
 python-gevent
 python-gflags
 python-netifaces
+python-setuptools #dist:f16,f17,f18
 python-sphinx

files/rpms/swift

@@ -8,8 +8,8 @@ python-eventlet
 python-greenlet
 python-netifaces
 python-nose
-python-paste-deploy
+python-paste-deploy # dist:f16,f17,f18
-python-setuptools
+python-setuptools   # dist:f16,f17,f18
 python-simplejson
 python-webob
 pyxattr

lib/rpc_backend

@@ -57,7 +57,11 @@ function cleanup_rpc_backend {
         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 @@ function install_rpc_backend() {
         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