@@ -19,9 +19,9 @@ Quick Start

 #. 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

@@ -25,6 +25,6 @@ bc

 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

@@ -110,7 +110,7 @@ function undefine_virsh_secret {

 # 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"

@@ -173,7 +173,7 @@ source $TOP_DIR/stackrc

 # 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"