Browse code
Remove support for Fedora 21 (EOL); add F22 where appropriate
Fedora 21 reached its End Of Life (EOL) on 1-DEC-2015[1]; remove it as
supported distribution.
- stack.sh: Remove Fedora 21 from list of supported distributions.
- tools/fixup_stuff.sh: Make the minimum Fedora version to be F22 in
from a conditional check in 'Python packages' section
- files/rpms/general: Remove 'f21' from NOPRIME.
- lib/ceph: Remove 'f21' from the check_os_support_ceph() function.
- doc/source/index.rst: s/Fedora 21/Fedora 22/
- pkg/elasticsearch.sh: Remove the 'if' conditional in the
install_elasticsearch() function.
[1] https://fedoramagazine.org/fedora-21-end-life-december-1st/
Change-Id: Ifbcc3dd783ff2f362a464fbf4ca22f20cc2c658e
Kashyap Chamarthy authored on 2015/12/02 02:04:40Showing 7 changed files
- doc/source/index.rst
- files/rpms/general
- files/rpms/nova
- lib/ceph
- pkg/elasticsearch.sh
- stack.sh
- tools/fixup_stuff.sh
| ... | ... |
@@ -20,7 +20,7 @@ Quick Start |
| 20 | 20 |
|
| 21 | 21 |
#. Select a Linux Distribution |
| 22 | 22 |
|
| 23 |
- Only Ubuntu 14.04 (Trusty), Fedora 21 (or Fedora 22) and CentOS/RHEL |
|
| 23 |
+ Only Ubuntu 14.04 (Trusty), Fedora 22 (or Fedora 23) and CentOS/RHEL |
|
| 24 | 24 |
7 are documented here. OpenStack also runs and is packaged on other |
| 25 | 25 |
flavors of Linux such as OpenSUSE and Debian. |
| 26 | 26 |
|
| ... | ... |
@@ -8,9 +8,9 @@ gcc-c++ |
| 8 | 8 |
gettext # used for compiling message catalogs |
| 9 | 9 |
git-core |
| 10 | 10 |
graphviz # needed only for docs |
| 11 |
-iptables-services # NOPRIME f21,f22,f23 |
|
| 11 |
+iptables-services # NOPRIME f22,f23 |
|
| 12 | 12 |
java-1.7.0-openjdk-headless # NOPRIME rhel7 |
| 13 |
-java-1.8.0-openjdk-headless # NOPRIME f21,f22,f23 |
|
| 13 |
+java-1.8.0-openjdk-headless # NOPRIME f22,f23 |
|
| 14 | 14 |
libffi-devel |
| 15 | 15 |
libjpeg-turbo-devel # Pillow 3.0.0 |
| 16 | 16 |
libxml2-devel # lxml |
| ... | ... |
@@ -26,7 +26,7 @@ postgresql-devel # psycopg2 |
| 26 | 26 |
psmisc |
| 27 | 27 |
pyOpenSSL # version in pip uses too much memory |
| 28 | 28 |
python-devel |
| 29 |
-redhat-rpm-config # MySQL-python rhbz-1195207 f21 |
|
| 29 |
+redhat-rpm-config # MySQL-python rhbz-1195207 |
|
| 30 | 30 |
screen |
| 31 | 31 |
tar |
| 32 | 32 |
tcpdump |
| ... | ... |
@@ -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|f21|f22|f23) ]]; then
|
|
| 119 |
+ if [[ ! ${DISTRO} =~ (trusty|f22|f23) ]]; 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" |
| ... | ... |
@@ -88,7 +88,6 @@ function install_elasticsearch {
|
| 88 | 88 |
sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
|
| 89 | 89 |
sudo update-rc.d elasticsearch defaults 95 10 |
| 90 | 90 |
elif is_fedora; then |
| 91 |
- if [[ "$os_RELEASE" -ge "21" ]]; then |
|
| 92 | 91 |
is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless |
| 93 | 92 |
else |
| 94 | 93 |
is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless |
| ... | ... |
@@ -195,7 +195,7 @@ source $TOP_DIR/stackrc |
| 195 | 195 |
|
| 196 | 196 |
# Warn users who aren't on an explicitly supported distro, but allow them to |
| 197 | 197 |
# override check and attempt installation with ``FORCE=yes ./stack`` |
| 198 |
-if [[ ! ${DISTRO} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f21|f22|f23|rhel7) ]]; then
|
|
| 198 |
+if [[ ! ${DISTRO} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f22|f23|rhel7) ]]; then
|
|
| 199 | 199 |
echo "WARNING: this script has not been tested on $DISTRO" |
| 200 | 200 |
if [[ "$FORCE" != "yes" ]]; then |
| 201 | 201 |
die $LINENO "If you wish to run this script anyway run with FORCE=yes" |
| ... | ... |
@@ -135,7 +135,7 @@ if is_fedora; then |
| 135 | 135 |
fi |
| 136 | 136 |
fi |
| 137 | 137 |
|
| 138 |
- if [[ "$os_VENDOR" == "Fedora" ]] && [[ "$os_RELEASE" -ge "21" ]]; then |
|
| 138 |
+ if [[ "$os_VENDOR" == "Fedora" ]] && [[ "$os_RELEASE" -ge "22" ]]; then |
|
| 139 | 139 |
# requests ships vendored version of chardet/urllib3, but on |
| 140 | 140 |
# fedora these are symlinked back to the primary versions to |
| 141 | 141 |
# avoid duplication of code on disk. This is fine when |