Allow to use Fedora 24 with devstack

Looks like f24 does not have any special change compared to the
previous release, we just need to add f24 where f23 present.

Change-Id: Ia4a58de4973ef228735c48b33453a0562dc65258
This commit is contained in:
Attila Fazekas 2016-06-01 16:43:07 +02:00
parent 35f0f09f00
commit 72b233c1e0
6 changed files with 7 additions and 7 deletions

View File

@ -7,9 +7,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 f22,f23 iptables-services # NOPRIME f22,f23,f24
java-1.7.0-openjdk-headless # NOPRIME rhel7 java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f22,f23 java-1.8.0-openjdk-headless # NOPRIME f22,f23,f24
libffi-devel libffi-devel
libjpeg-turbo-devel # Pillow 3.0.0 libjpeg-turbo-devel # Pillow 3.0.0
libxml2-devel # lxml libxml2-devel # lxml

View File

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

View File

@ -2,7 +2,7 @@ curl
liberasurecode-devel liberasurecode-devel
memcached memcached
pyxattr pyxattr
rsync-daemon # dist:f22,f23 rsync-daemon # dist:f22,f23,f24
sqlite sqlite
xfsprogs xfsprogs
xinetd xinetd

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|f22|f23) ]]; then if [[ ! ${DISTRO} =~ (trusty|f22|f23|f24) ]]; 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"

View File

@ -185,7 +185,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|wily|xenial|7.0|wheezy|sid|testing|jessie|f22|f23|rhel7|kvmibm1) ]]; then if [[ ! ${DISTRO} =~ (trusty|wily|xenial|7.0|wheezy|sid|testing|jessie|f22|f23|f24|rhel7|kvmibm1) ]]; 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"

View File

@ -116,7 +116,7 @@ get_versions
# Eradicate any and all system packages # Eradicate any and all system packages
# Python in f23 and f22 depends on the python-pip package so removing it # Python in fedora depends on the python-pip package so removing it
# results in a nonfunctional system. pip on fedora installs to /usr so pip # results in a nonfunctional system. pip on fedora installs to /usr so pip
# can safely override the system pip for all versions of fedora # can safely override the system pip for all versions of fedora
if ! is_fedora ; then if ! is_fedora ; then