Remove Fedora 20 as supported distribution
Fedora 20 will reach end of life on 23-JUN-2015[1]; remove it as
supported distribution. Add Fedora 22 where applicable.
- stack.sh: Remove Fedora 20 from list of supported distributions.
- files/rpms/general: Remove 'f20' from NOPRIME.
- lib/ceph: Remove 'f20' from the check_os_support_ceph()
function.
- doc/source/index.rst: s/Fedora 20/Fedora 21/
[1] https://lists.fedoraproject.org/pipermail/devel-announce/2015-May/001586.html
Change-Id: I8f2e1ddc24c071754b1cceb5bed5bdafdc9d9f79
diff --git a/doc/source/index.rst b/doc/source/index.rst
index e0c3f3a..6d0edb0 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -19,9 +19,9 @@
#. Select a Linux Distribution
- Only Ubuntu 14.04 (Trusty), Fedora 20 and CentOS/RHEL 7 are
- documented here. OpenStack also runs and is packaged on other flavors
- of Linux such as OpenSUSE and Debian.
+ Only Ubuntu 14.04 (Trusty), Fedora 21 (or Fedora 22) and CentOS/RHEL
+ 7 are documented here. OpenStack also runs and is packaged on other
+ flavors of Linux such as OpenSUSE and Debian.
#. Install Selected OS
diff --git a/files/rpms/general b/files/rpms/general
index 7b2c00a..67b084e 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -25,6 +25,6 @@
libyaml-devel
gettext # used for compiling message catalogs
net-tools
-java-1.7.0-openjdk-headless # NOPRIME rhel7,f20
+java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f21,f22
pyOpenSSL # version in pip uses too much memory
diff --git a/lib/ceph b/lib/ceph
index 4d6ca4a..cbdc3b8 100644
--- a/lib/ceph
+++ b/lib/ceph
@@ -110,7 +110,7 @@
# check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
function check_os_support_ceph {
- if [[ ! ${DISTRO} =~ (trusty|f20|f21|f22) ]]; then
+ if [[ ! ${DISTRO} =~ (trusty|f21|f22) ]]; then
echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)"
if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"
diff --git a/stack.sh b/stack.sh
index dc79fa9..0c01165 100755
--- a/stack.sh
+++ b/stack.sh
@@ -173,7 +173,7 @@
# 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} =~ (precise|trusty|utopic|vivid|7.0|wheezy|sid|testing|jessie|f20|f21|f22|rhel7) ]]; then
+if [[ ! ${DISTRO} =~ (precise|trusty|utopic|vivid|7.0|wheezy|sid|testing|jessie|f21|f22|rhel7) ]]; 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"