Browse code

Allow to use Fedora 24 with devstack

Looks like f24 does not have any special change compared to the
previous release, we just need to add f24 where f23 present.

Change-Id: Ia4a58de4973ef228735c48b33453a0562dc65258

Attila Fazekas authored on 2016/06/01 23:43:07
Showing 6 changed files
... ...
@@ -7,9 +7,9 @@ gcc-c++
7 7
 gettext  # used for compiling message catalogs
8 8
 git-core
9 9
 graphviz # needed only for docs
10
-iptables-services  # NOPRIME f22,f23
10
+iptables-services  # NOPRIME f22,f23,f24
11 11
 java-1.7.0-openjdk-headless  # NOPRIME rhel7
12
-java-1.8.0-openjdk-headless  # NOPRIME f22,f23
12
+java-1.8.0-openjdk-headless  # NOPRIME f22,f23,f24
13 13
 libffi-devel
14 14
 libjpeg-turbo-devel # Pillow 3.0.0
15 15
 libxml2-devel # lxml
... ...
@@ -7,7 +7,7 @@ gawk
7 7
 genisoimage # required for config_drive
8 8
 iptables
9 9
 iputils
10
-kernel-modules # dist:f22,f23
10
+kernel-modules # dist:f22,f23,f24
11 11
 kpartx
12 12
 kvm # NOPRIME
13 13
 libvirt-bin # NOPRIME
... ...
@@ -2,7 +2,7 @@ curl
2 2
 liberasurecode-devel
3 3
 memcached
4 4
 pyxattr
5
-rsync-daemon # dist:f22,f23
5
+rsync-daemon # dist:f22,f23,f24
6 6
 sqlite
7 7
 xfsprogs
8 8
 xinetd
... ...
@@ -116,7 +116,7 @@ function undefine_virsh_secret {
116 116
 
117 117
 # check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
118 118
 function check_os_support_ceph {
119
-    if [[ ! ${DISTRO} =~ (trusty|f22|f23) ]]; then
119
+    if [[ ! ${DISTRO} =~ (trusty|f22|f23|f24) ]]; then
120 120
         echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)"
121 121
         if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
122 122
             die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"
... ...
@@ -185,7 +185,7 @@ source $TOP_DIR/stackrc
185 185
 
186 186
 # Warn users who aren't on an explicitly supported distro, but allow them to
187 187
 # override check and attempt installation with ``FORCE=yes ./stack``
188
-if [[ ! ${DISTRO} =~ (trusty|wily|xenial|7.0|wheezy|sid|testing|jessie|f22|f23|rhel7|kvmibm1) ]]; then
188
+if [[ ! ${DISTRO} =~ (trusty|wily|xenial|7.0|wheezy|sid|testing|jessie|f22|f23|f24|rhel7|kvmibm1) ]]; then
189 189
     echo "WARNING: this script has not been tested on $DISTRO"
190 190
     if [[ "$FORCE" != "yes" ]]; then
191 191
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"
... ...
@@ -116,7 +116,7 @@ get_versions
116 116
 
117 117
 # Eradicate any and all system packages
118 118
 
119
-# Python in f23 and f22 depends on the python-pip package so removing it
119
+# Python in fedora depends on the python-pip package so removing it
120 120
 # results in a nonfunctional system. pip on fedora installs to /usr so pip
121 121
 # can safely override the system pip for all versions of fedora
122 122
 if ! is_fedora ; then