From 9fd38e79701b65d41116a8915e47978fc50176c6 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Mon, 11 Dec 2017 12:20:25 +0100 Subject: [PATCH] Add Fedora 27 support Removing the (f23,)f24 support they are EOL. The only non-trivial change is the apache-httpd default worker change, however might not be bad idea to use `event` instead of `worker` in the future, but for now keep it AS-IS and continue to use `worker`. Change-Id: I96d414a30b58bc4b43da45066fdf310a6a830079 Closes-Bug: #1740194 --- files/rpms/cinder | 4 ++-- files/rpms/general | 4 ++-- files/rpms/nova | 2 +- files/rpms/swift | 2 +- lib/apache | 3 ++- stack.sh | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/files/rpms/cinder b/files/rpms/cinder index 3bc4e7ae72..e6addc62aa 100644 --- a/files/rpms/cinder +++ b/files/rpms/cinder @@ -1,5 +1,5 @@ iscsi-initiator-utils lvm2 qemu-img -scsi-target-utils # not:rhel7,f24,f25,f26 NOPRIME -targetcli # dist:rhel7,f24,f25,f26 NOPRIME +scsi-target-utils # not:rhel7,f25,f26,f27 NOPRIME +targetcli # dist:rhel7,f25,f26,f27 NOPRIME diff --git a/files/rpms/general b/files/rpms/general index f3f870823c..878b935a1b 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -9,9 +9,9 @@ git-core graphviz # needed only for docs httpd httpd-devel -iptables-services # NOPRIME f23,f24,f25,f26 +iptables-services # NOPRIME f25,f26,f27 java-1.7.0-openjdk-headless # NOPRIME rhel7 -java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25,f26 +java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27 libffi-devel libjpeg-turbo-devel # Pillow 3.0.0 libxml2-devel # lxml diff --git a/files/rpms/nova b/files/rpms/nova index 64ed480632..9fb7282df5 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -7,7 +7,7 @@ gawk genisoimage # required for config_drive iptables iputils -kernel-modules # dist:f23,f24,f25,f26 +kernel-modules # dist:f25,f26,f27 kpartx libxml2-python m2crypto diff --git a/files/rpms/swift b/files/rpms/swift index 2e09cec28f..be0db140e3 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -2,7 +2,7 @@ curl liberasurecode-devel memcached pyxattr -rsync-daemon # dist:f23,f24,f25,f26 +rsync-daemon # dist:f25,f26,f27 sqlite xfsprogs xinetd diff --git a/lib/apache b/lib/apache index 3af341174e..84cec73234 100644 --- a/lib/apache +++ b/lib/apache @@ -133,8 +133,9 @@ function install_apache_wsgi { sudo rm -f /etc/httpd/conf.d/000-* install_package httpd mod_wsgi # For consistency with Ubuntu, switch to the worker mpm, as - # the default is prefork + # the default is event sudo sed -i '/mod_mpm_prefork.so/s/^/#/g' /etc/httpd/conf.modules.d/00-mpm.conf + sudo sed -i '/mod_mpm_event.so/s/^/#/g' /etc/httpd/conf.modules.d/00-mpm.conf sudo sed -i '/mod_mpm_worker.so/s/^#//g' /etc/httpd/conf.modules.d/00-mpm.conf elif is_suse; then install_package apache2 apache2-mod_wsgi diff --git a/stack.sh b/stack.sh index 1d0381483a..32eb43f292 100755 --- a/stack.sh +++ b/stack.sh @@ -221,7 +221,7 @@ write_devstack_version # 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} =~ (xenial|zesty|artful|stretch|jessie|f24|f25|f26|opensuse-42.2|opensuse-42.3|rhel7) ]]; then +if [[ ! ${DISTRO} =~ (xenial|zesty|artful|stretch|jessie|f25|f26|f27|opensuse-42.2|opensuse-42.3|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"