From 90bc5867728aafb66b374ae6e6a93318303dcff0 Mon Sep 17 00:00:00 2001 From: Kashyap Chamarthy Date: Tue, 1 Dec 2015 18:04:40 +0100 Subject: [PATCH] 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 --- doc/source/index.rst | 2 +- files/rpms/general | 6 +++--- files/rpms/nova | 2 +- lib/ceph | 2 +- pkg/elasticsearch.sh | 1 - stack.sh | 2 +- tools/fixup_stuff.sh | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 2622436820..4a1d93d817 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -20,7 +20,7 @@ Quick Start #. Select a Linux Distribution - Only Ubuntu 14.04 (Trusty), Fedora 21 (or Fedora 22) and CentOS/RHEL + Only Ubuntu 14.04 (Trusty), Fedora 22 (or Fedora 23) and CentOS/RHEL 7 are documented here. OpenStack also runs and is packaged on other flavors of Linux such as OpenSUSE and Debian. diff --git a/files/rpms/general b/files/rpms/general index 280468283b..5bc87b6172 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -8,9 +8,9 @@ gcc-c++ gettext # used for compiling message catalogs git-core graphviz # needed only for docs -iptables-services # NOPRIME f21,f22,f23 +iptables-services # NOPRIME f22,f23 java-1.7.0-openjdk-headless # NOPRIME rhel7 -java-1.8.0-openjdk-headless # NOPRIME f21,f22,f23 +java-1.8.0-openjdk-headless # NOPRIME f22,f23 libffi-devel libjpeg-turbo-devel # Pillow 3.0.0 libxml2-devel # lxml @@ -26,7 +26,7 @@ postgresql-devel # psycopg2 psmisc pyOpenSSL # version in pip uses too much memory python-devel -redhat-rpm-config # MySQL-python rhbz-1195207 f21 +redhat-rpm-config # MySQL-python rhbz-1195207 screen tar tcpdump diff --git a/files/rpms/nova b/files/rpms/nova index 4db9a06d95..0312e856dd 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -7,7 +7,7 @@ gawk genisoimage # required for config_drive iptables iputils -kernel-modules # dist:f21,f22,f23 +kernel-modules # dist:f22,f23 kpartx kvm # NOPRIME libvirt-bin # NOPRIME diff --git a/lib/ceph b/lib/ceph index 4ac498ab97..3e0839aaa2 100644 --- a/lib/ceph +++ b/lib/ceph @@ -116,7 +116,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|f21|f22|f23) ]]; then + if [[ ! ${DISTRO} =~ (trusty|f22|f23) ]]; 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/pkg/elasticsearch.sh b/pkg/elasticsearch.sh index 14d13cf733..7488306845 100755 --- a/pkg/elasticsearch.sh +++ b/pkg/elasticsearch.sh @@ -88,7 +88,6 @@ function install_elasticsearch { sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb sudo update-rc.d elasticsearch defaults 95 10 elif is_fedora; then - if [[ "$os_RELEASE" -ge "21" ]]; then is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless else is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless diff --git a/stack.sh b/stack.sh index bc67ce069c..b5dc51c6ec 100755 --- a/stack.sh +++ b/stack.sh @@ -195,7 +195,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} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f21|f22|f23|rhel7) ]]; then +if [[ ! ${DISTRO} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f22|f23|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" diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 9ae2ae7d90..193a1f7aba 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -135,7 +135,7 @@ if is_fedora; then fi fi - if [[ "$os_VENDOR" == "Fedora" ]] && [[ "$os_RELEASE" -ge "21" ]]; then + if [[ "$os_VENDOR" == "Fedora" ]] && [[ "$os_RELEASE" -ge "22" ]]; then # requests ships vendored version of chardet/urllib3, but on # fedora these are symlinked back to the primary versions to # avoid duplication of code on disk. This is fine when