Browse code

Merge "Add support for Fedora 20"

Jenkins authored on 2014/01/11 18:18:21
Showing 11 changed files
... ...
@@ -4,3 +4,4 @@ qemu-img
4 4
 python-devel
5 5
 postgresql-devel
6 6
 iscsi-initiator-utils
7
+python-lxml         #dist:f18,f19,f20
... ...
@@ -20,6 +20,7 @@ tar
20 20
 tcpdump
21 21
 unzip
22 22
 wget
23
+which
23 24
 
24 25
 # [1] : some of installed tools have unversioned dependencies on this,
25 26
 # but others have versioned (<=0.7).  So if a later version (0.7.1)
... ...
@@ -1,6 +1,6 @@
1 1
 gcc
2 2
 libffi-devel        # testonly
3
-libxml2-devel
3
+libxml2-devel       # testonly
4 4
 libxslt-devel       # testonly
5 5
 mysql-devel         # testonly
6 6
 openssl-devel       # testonly
... ...
@@ -9,7 +9,8 @@ python-argparse
9 9
 python-devel
10 10
 python-eventlet
11 11
 python-greenlet
12
-python-paste-deploy #dist:f16,f17,f18,f19
12
+python-lxml         #dist:f18,f19,f20
13
+python-paste-deploy #dist:f18,f19,f20
13 14
 python-routes
14 15
 python-sqlalchemy
15 16
 python-wsgiref
... ...
@@ -16,8 +16,8 @@ python-kombu
16 16
 python-migrate
17 17
 python-mox
18 18
 python-nose
19
-python-paste        #dist:f16,f17,f18,f19
20
-python-paste-deploy #dist:f16,f17,f18,f19
19
+python-paste        #dist:f18,f19,f20
20
+python-paste-deploy #dist:f18,f19,f20
21 21
 python-routes
22 22
 python-sphinx
23 23
 python-sqlalchemy
... ...
@@ -1,11 +1,11 @@
1 1
 python-greenlet
2
-python-lxml         #dist:f16,f17,f18,f19
3
-python-paste        #dist:f16,f17,f18,f19
4
-python-paste-deploy #dist:f16,f17,f18,f19
5
-python-paste-script #dist:f16,f17,f18,f19
2
+libxslt-devel       # dist:f20
3
+python-lxml         #dist:f18,f19,f20
4
+python-paste        #dist:f18,f19,f20
5
+python-paste-deploy #dist:f18,f19,f20
6
+python-paste-script #dist:f18,f19,f20
6 7
 python-routes
7 8
 python-sqlalchemy
8
-python-sqlite2
9 9
 python-webob
10 10
 sqlite
11 11
 
... ...
@@ -11,8 +11,8 @@ python-greenlet
11 11
 python-iso8601
12 12
 python-kombu
13 13
 #rhel6 gets via pip
14
-python-paste        # dist:f16,f17,f18,f19
15
-python-paste-deploy # dist:f16,f17,f18,f19
14
+python-paste        # dist:f18,f19,f20
15
+python-paste-deploy # dist:f18,f19,f20
16 16
 python-qpid
17 17
 python-routes
18 18
 python-sqlalchemy
... ...
@@ -28,11 +28,11 @@ python-kombu
28 28
 python-lockfile
29 29
 python-migrate
30 30
 python-mox
31
-python-paramiko # dist:f16,f17,f18,f19
31
+python-paramiko # dist:f18,f19,f20
32 32
 # ^ on RHEL, brings in python-crypto which conflicts with version from
33 33
 # pip we need
34
-python-paste        # dist:f16,f17,f18,f19
35
-python-paste-deploy # dist:f16,f17,f18,f19
34
+python-paste        # dist:f18,f19,f20
35
+python-paste-deploy # dist:f18,f19,f20
36 36
 python-qpid
37 37
 python-routes
38 38
 python-sqlalchemy
... ...
@@ -9,7 +9,7 @@ python-eventlet
9 9
 python-greenlet
10 10
 python-netifaces
11 11
 python-nose
12
-python-paste-deploy # dist:f16,f17,f18,f19
12
+python-paste-deploy # dist:f18,f19,f20
13 13
 python-simplejson
14 14
 python-webob
15 15
 pyxattr
... ...
@@ -1 +1 @@
1
-libxslt-dev
2 1
\ No newline at end of file
2
+libxslt-devel
... ...
@@ -1 +1 @@
1
-libxslt1-dev   # testonly
1
+libxslt-devel   # testonly
... ...
@@ -12,7 +12,7 @@
12 12
 # developer install.
13 13
 
14 14
 # To keep this script simple we assume you are running on a recent **Ubuntu**
15
-# (12.04 Precise or newer) or **Fedora** (F16 or newer) machine.  (It may work
15
+# (12.04 Precise or newer) or **Fedora** (F18 or newer) machine.  (It may work
16 16
 # on other platforms but support for those platforms is left to those who added
17 17
 # them to DevStack.)  It should work in a VM or physical server.  Additionally
18 18
 # we maintain a list of ``apt`` and ``rpm`` dependencies and other configuration
... ...
@@ -131,7 +131,7 @@ disable_negated_services
131 131
 
132 132
 # Warn users who aren't on an explicitly supported distro, but allow them to
133 133
 # override check and attempt installation with ``FORCE=yes ./stack``
134
-if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f16|f17|f18|f19|opensuse-12.2|rhel6) ]]; then
134
+if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f18|f19|f20|opensuse-12.2|rhel6) ]]; then
135 135
     echo "WARNING: this script has not been tested on $DISTRO"
136 136
     if [[ "$FORCE" != "yes" ]]; then
137 137
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"