openstack/devstack
Code Issues Proposed changes

Modify RPM lists for RHEL6

Browse Source 
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
This commit is contained in:
Ian Wienand 2013-04-11 12:01:09 +10:00
parent 41f7485250
commit 64dd03dd78
8 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/rpms/glance
View File

@ -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

4
files/rpms/horizon
View File

@ -17,8 +17,8 @@ python-migrate
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

12
files/rpms/keystone
View File

@ -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

8
files/rpms/nova
View File

@ -28,9 +28,11 @@ python-lockfile
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

8
files/rpms/quantum
View File

@ -10,14 +10,16 @@ python-greenlet
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

2
files/rpms/ryu
View File

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

4
files/rpms/swift
View File

@ -8,8 +8,8 @@ python-eventlet
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

17
lib/rpc_backend
View File

@ -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