openstack/devstack
Code Issues Proposed changes

Remove support for Fedora 21 (EOL); add F22 where appropriate

Browse Source 
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
This commit is contained in:
Kashyap Chamarthy 2015-12-01 18:04:40 +01:00
parent e60d52c392
commit 90bc586772
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/index.rst
View File

@ -20,7 +20,7 @@ Quick Start
#. Select a Linux Distribution #. 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 7 are documented here. OpenStack also runs and is packaged on other
flavors of Linux such as OpenSUSE and Debian. flavors of Linux such as OpenSUSE and Debian.

6
files/rpms/general
View File

@ -8,9 +8,9 @@ gcc-c++
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
git-core git-core
graphviz # needed only for docs 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.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 libffi-devel
libjpeg-turbo-devel # Pillow 3.0.0 libjpeg-turbo-devel # Pillow 3.0.0
libxml2-devel # lxml libxml2-devel # lxml
@ -26,7 +26,7 @@ postgresql-devel # psycopg2
psmisc psmisc
pyOpenSSL # version in pip uses too much memory pyOpenSSL # version in pip uses too much memory
python-devel python-devel
redhat-rpm-config # MySQL-python rhbz-1195207 f21 redhat-rpm-config # MySQL-python rhbz-1195207
screen screen
tar tar
tcpdump tcpdump

2
files/rpms/nova
View File

@ -7,7 +7,7 @@ gawk
genisoimage # required for config_drive genisoimage # required for config_drive
iptables iptables
iputils iputils
kernel-modules # dist:f21,f22,f23 kernel-modules # dist:f22,f23
kpartx kpartx
kvm # NOPRIME kvm # NOPRIME
libvirt-bin # NOPRIME libvirt-bin # NOPRIME

2
lib/ceph
View File

@ -116,7 +116,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|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)" 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"

1
pkg/elasticsearch.sh
View File

@ -88,7 +88,6 @@ function install_elasticsearch {
sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
sudo update-rc.d elasticsearch defaults 95 10 sudo update-rc.d elasticsearch defaults 95 10
elif is_fedora; then 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 is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless
else else
is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless

2
stack.sh
View File

@ -195,7 +195,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} =~ (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" 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"

2
tools/fixup_stuff.sh
View File

@ -135,7 +135,7 @@ if is_fedora; then
fi fi
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 # requests ships vendored version of chardet/urllib3, but on
# fedora these are symlinked back to the primary versions to # fedora these are symlinked back to the primary versions to
# avoid duplication of code on disk. This is fine when # avoid duplication of code on disk. This is fine when