openstack/devstack
Code Issues Proposed changes

Remove Fedora 20 as supported distribution

Browse Source 
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
This commit is contained in:
Kashyap Chamarthy 2015-05-27 21:59:32 +02:00
parent 21b7e975fa
commit a53ae68889
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/index.rst
View File

@ -19,9 +19,9 @@ Quick Start
#. Select a Linux Distribution #. Select a Linux Distribution
Only Ubuntu 14.04 (Trusty), Fedora 20 and CentOS/RHEL 7 are Only Ubuntu 14.04 (Trusty), Fedora 21 (or Fedora 22) and CentOS/RHEL
documented here. OpenStack also runs and is packaged on other flavors 7 are documented here. OpenStack also runs and is packaged on other
of Linux such as OpenSUSE and Debian. flavors of Linux such as OpenSUSE and Debian.
#. Install Selected OS #. Install Selected OS

2
files/rpms/general
View File

@ -25,6 +25,6 @@ bc
libyaml-devel libyaml-devel
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
net-tools 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 java-1.8.0-openjdk-headless # NOPRIME f21,f22
pyOpenSSL # version in pip uses too much memory pyOpenSSL # version in pip uses too much memory

2
lib/ceph
View File

@ -110,7 +110,7 @@ function undefine_virsh_secret {
# check_os_support_ceph() - Check if the operating system provides a decent version of Ceph # check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
function check_os_support_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)" 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 if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes" die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"

2
stack.sh
View File

@ -173,7 +173,7 @@ source $TOP_DIR/stackrc
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # 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" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"