Browse code
Merge "Modify RPM lists for RHEL6"
Jenkins authored on 2013/04/26 09:32:45Showing 8 changed files
- files/rpms/glance
- files/rpms/horizon
- files/rpms/keystone
- files/rpms/nova
- files/rpms/quantum
- files/rpms/ryu
- files/rpms/swift
- lib/rpc_backend
| ... | ... |
@@ -1,11 +1,13 @@ |
| 1 | 1 |
python-greenlet |
| 2 |
-python-lxml |
|
| 3 |
-python-paste |
|
| 4 |
-python-paste-deploy |
|
| 5 |
-python-paste-script |
|
| 2 |
+python-lxml #dist:f16,f17,f18 |
|
| 3 |
+python-paste #dist:f16,f17,f18 |
|
| 4 |
+python-paste-deploy #dist:f16,f17,f18 |
|
| 5 |
+python-paste-script #dist:f16,f17,f18 |
|
| 6 | 6 |
python-routes |
| 7 |
-python-setuptools |
|
| 7 |
+python-setuptools #dist:f16,f17,f18 |
|
| 8 | 8 |
python-sqlalchemy |
| 9 | 9 |
python-sqlite2 |
| 10 | 10 |
python-webob |
| 11 | 11 |
sqlite |
| 12 |
+ |
|
| 13 |
+# Deps installed via pip for RHEL |
|
| 12 | 14 |
\ No newline at end of file |
| ... | ... |
@@ -29,9 +29,11 @@ python-lockfile |
| 29 | 29 |
python-migrate |
| 30 | 30 |
python-mox |
| 31 | 31 |
python-netaddr |
| 32 |
-python-paramiko |
|
| 33 |
-python-paste |
|
| 34 |
-python-paste-deploy |
|
| 32 |
+python-paramiko # dist:f16,f17,f18 |
|
| 33 |
+# ^ on RHEL, brings in python-crypto which conflicts with version from |
|
| 34 |
+# pip we need |
|
| 35 |
+python-paste # dist:f16,f17,f18 |
|
| 36 |
+python-paste-deploy # dist:f16,f17,f18 |
|
| 35 | 37 |
python-qpid |
| 36 | 38 |
python-routes |
| 37 | 39 |
python-sqlalchemy |
| ... | ... |
@@ -10,14 +10,16 @@ python-greenlet |
| 10 | 10 |
python-iso8601 |
| 11 | 11 |
python-kombu |
| 12 | 12 |
python-netaddr |
| 13 |
-python-paste |
|
| 14 |
-python-paste-deploy |
|
| 13 |
+#rhel6 gets via pip |
|
| 14 |
+python-paste # dist:f16,f17,f18 |
|
| 15 |
+python-paste-deploy # dist:f16,f17,f18 |
|
| 15 | 16 |
python-qpid |
| 16 | 17 |
python-routes |
| 17 | 18 |
python-sqlalchemy |
| 18 | 19 |
python-suds |
| 19 | 20 |
rabbitmq-server # NOPRIME |
| 20 |
-qpid-cpp-server-daemon # NOPRIME |
|
| 21 |
+qpid-cpp-server-daemon # NOPRIME dist:f16,f17,f18 |
|
| 22 |
+qpid-cpp-server # NOPRIME dist:rhel6 |
|
| 21 | 23 |
sqlite |
| 22 | 24 |
sudo |
| 23 | 25 |
vconfig |
| ... | ... |
@@ -57,7 +57,11 @@ function cleanup_rpc_backend {
|
| 57 | 57 |
fi |
| 58 | 58 |
elif is_service_enabled qpid; then |
| 59 | 59 |
if is_fedora; then |
| 60 |
- uninstall_package qpid-cpp-server-daemon |
|
| 60 |
+ if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 61 |
+ uninstall_package qpid-cpp-server |
|
| 62 |
+ else |
|
| 63 |
+ uninstall_package qpid-cpp-server-daemon |
|
| 64 |
+ fi |
|
| 61 | 65 |
elif is_ubuntu; then |
| 62 | 66 |
uninstall_package qpidd |
| 63 | 67 |
else |
| ... | ... |
@@ -87,7 +91,16 @@ function install_rpc_backend() {
|
| 87 | 87 |
rm -f "$tfile" |
| 88 | 88 |
elif is_service_enabled qpid; then |
| 89 | 89 |
if is_fedora; then |
| 90 |
- install_package qpid-cpp-server-daemon |
|
| 90 |
+ if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 91 |
+ install_package qpid-cpp-server |
|
| 92 |
+ |
|
| 93 |
+ # RHEL6 leaves "auth=yes" in /etc/qpidd.conf, it needs to |
|
| 94 |
+ # be no or you get GSS authentication errors as it |
|
| 95 |
+ # attempts to default to this. |
|
| 96 |
+ sudo sed -i.bak 's/^auth=yes$/auth=no/' /etc/qpidd.conf |
|
| 97 |
+ else |
|
| 98 |
+ install_package qpid-cpp-server-daemon |
|
| 99 |
+ fi |
|
| 91 | 100 |
elif is_ubuntu; then |
| 92 | 101 |
install_package qpidd |
| 93 | 102 |
sudo sed -i '/PLAIN/!s/mech_list: /mech_list: PLAIN /' /etc/sasl2/qpidd.conf |