From d7f6090f29786f091773497bc3597142d94619ec Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Ortega Date: Sun, 22 Dec 2013 17:03:47 +0100 Subject: [PATCH] Add support for Fedora 20 The list of RPM packages have been updated to support the recently released Fedora 20 distribution. Closes-Bug: #1263291 Co-Authored: Alvaro Lopez Ortega Change-Id: Ia66abef1a1a54e6d5ee6eebc12908cef3f1d211d --- files/rpms/cinder | 1 + files/rpms/general | 1 + files/rpms/glance | 5 +++-- files/rpms/horizon | 4 ++-- files/rpms/keystone | 10 +++++----- files/rpms/neutron | 4 ++-- files/rpms/nova | 6 +++--- files/rpms/swift | 2 +- files/rpms/tempest | 2 +- files/rpms/trove | 2 +- stack.sh | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/files/rpms/cinder b/files/rpms/cinder index c4edb68f14..623c13e676 100644 --- a/files/rpms/cinder +++ b/files/rpms/cinder @@ -4,3 +4,4 @@ qemu-img python-devel postgresql-devel iscsi-initiator-utils +python-lxml #dist:f18,f19,f20 diff --git a/files/rpms/general b/files/rpms/general index 2db31d1db0..40246ea4ab 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -20,6 +20,7 @@ tar tcpdump unzip wget +which # [1] : some of installed tools have unversioned dependencies on this, # but others have versioned (<=0.7). So if a later version (0.7.1) diff --git a/files/rpms/glance b/files/rpms/glance index dd66171f7a..fffd9c85b4 100644 --- a/files/rpms/glance +++ b/files/rpms/glance @@ -1,6 +1,6 @@ gcc libffi-devel # testonly -libxml2-devel +libxml2-devel # testonly libxslt-devel # testonly mysql-devel # testonly openssl-devel # testonly @@ -9,7 +9,8 @@ python-argparse python-devel python-eventlet python-greenlet -python-paste-deploy #dist:f16,f17,f18,f19 +python-lxml #dist:f18,f19,f20 +python-paste-deploy #dist:f18,f19,f20 python-routes python-sqlalchemy python-wsgiref diff --git a/files/rpms/horizon b/files/rpms/horizon index aa27ab4e97..59503cc9aa 100644 --- a/files/rpms/horizon +++ b/files/rpms/horizon @@ -16,8 +16,8 @@ python-kombu python-migrate python-mox python-nose -python-paste #dist:f16,f17,f18,f19 -python-paste-deploy #dist:f16,f17,f18,f19 +python-paste #dist:f18,f19,f20 +python-paste-deploy #dist:f18,f19,f20 python-routes python-sphinx python-sqlalchemy diff --git a/files/rpms/keystone b/files/rpms/keystone index 52dbf477d8..99e8524628 100644 --- a/files/rpms/keystone +++ b/files/rpms/keystone @@ -1,11 +1,11 @@ python-greenlet -python-lxml #dist:f16,f17,f18,f19 -python-paste #dist:f16,f17,f18,f19 -python-paste-deploy #dist:f16,f17,f18,f19 -python-paste-script #dist:f16,f17,f18,f19 +libxslt-devel # dist:f20 +python-lxml #dist:f18,f19,f20 +python-paste #dist:f18,f19,f20 +python-paste-deploy #dist:f18,f19,f20 +python-paste-script #dist:f18,f19,f20 python-routes python-sqlalchemy -python-sqlite2 python-webob sqlite diff --git a/files/rpms/neutron b/files/rpms/neutron index a7700f77d4..67bf52350a 100644 --- a/files/rpms/neutron +++ b/files/rpms/neutron @@ -11,8 +11,8 @@ python-greenlet python-iso8601 python-kombu #rhel6 gets via pip -python-paste # dist:f16,f17,f18,f19 -python-paste-deploy # dist:f16,f17,f18,f19 +python-paste # dist:f18,f19,f20 +python-paste-deploy # dist:f18,f19,f20 python-qpid python-routes python-sqlalchemy diff --git a/files/rpms/nova b/files/rpms/nova index c99f3defc8..ac70ac5d6f 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -28,11 +28,11 @@ python-kombu python-lockfile python-migrate python-mox -python-paramiko # dist:f16,f17,f18,f19 +python-paramiko # dist:f18,f19,f20 # ^ on RHEL, brings in python-crypto which conflicts with version from # pip we need -python-paste # dist:f16,f17,f18,f19 -python-paste-deploy # dist:f16,f17,f18,f19 +python-paste # dist:f18,f19,f20 +python-paste-deploy # dist:f18,f19,f20 python-qpid python-routes python-sqlalchemy diff --git a/files/rpms/swift b/files/rpms/swift index b137f30dce..32432bca9b 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -9,7 +9,7 @@ python-eventlet python-greenlet python-netifaces python-nose -python-paste-deploy # dist:f16,f17,f18,f19 +python-paste-deploy # dist:f18,f19,f20 python-simplejson python-webob pyxattr diff --git a/files/rpms/tempest b/files/rpms/tempest index de32b81504..e7bbd43cd6 100644 --- a/files/rpms/tempest +++ b/files/rpms/tempest @@ -1 +1 @@ -libxslt-dev \ No newline at end of file +libxslt-devel diff --git a/files/rpms/trove b/files/rpms/trove index 09dcee8104..c5cbdea012 100644 --- a/files/rpms/trove +++ b/files/rpms/trove @@ -1 +1 @@ -libxslt1-dev # testonly +libxslt-devel # testonly diff --git a/stack.sh b/stack.sh index ce5fbd47e5..4e12c45523 100755 --- a/stack.sh +++ b/stack.sh @@ -12,7 +12,7 @@ # developer install. # To keep this script simple we assume you are running on a recent **Ubuntu** -# (12.04 Precise or newer) or **Fedora** (F16 or newer) machine. (It may work +# (12.04 Precise or newer) or **Fedora** (F18 or newer) machine. (It may work # on other platforms but support for those platforms is left to those who added # them to DevStack.) It should work in a VM or physical server. Additionally # we maintain a list of ``apt`` and ``rpm`` dependencies and other configuration @@ -131,7 +131,7 @@ disable_negated_services # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f16|f17|f18|f19|opensuse-12.2|rhel6) ]]; then +if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f18|f19|f20|opensuse-12.2|rhel6) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes"