diff --git a/files/rpms/general b/files/rpms/general index 2d4a97a743..ee2e8a058b 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -7,9 +7,9 @@ gcc-c++ gettext # used for compiling message catalogs git-core 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.8.0-openjdk-headless # NOPRIME f22,f23 +java-1.8.0-openjdk-headless # NOPRIME f22,f23,f24 libffi-devel libjpeg-turbo-devel # Pillow 3.0.0 libxml2-devel # lxml diff --git a/files/rpms/nova b/files/rpms/nova index 0312e856dd..594393e733 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -7,7 +7,7 @@ gawk genisoimage # required for config_drive iptables iputils -kernel-modules # dist:f22,f23 +kernel-modules # dist:f22,f23,f24 kpartx kvm # NOPRIME libvirt-bin # NOPRIME diff --git a/files/rpms/swift b/files/rpms/swift index 46dc59d74d..1e05167bcf 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -2,7 +2,7 @@ curl liberasurecode-devel memcached pyxattr -rsync-daemon # dist:f22,f23 +rsync-daemon # dist:f22,f23,f24 sqlite xfsprogs xinetd diff --git a/lib/ceph b/lib/ceph index 3e0839aaa2..e999647ed8 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|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)" 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/stack.sh b/stack.sh index 68e3d936b8..173628ebba 100755 --- a/stack.sh +++ b/stack.sh @@ -185,7 +185,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|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" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes" diff --git a/tools/install_pip.sh b/tools/install_pip.sh index dfa4f42573..12676998d2 100755 --- a/tools/install_pip.sh +++ b/tools/install_pip.sh @@ -116,7 +116,7 @@ get_versions # 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 # can safely override the system pip for all versions of fedora if ! is_fedora ; then