diff --git a/files/rpms/general b/files/rpms/general index 40b06f489b..280468283b 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 +iptables-services # NOPRIME f21,f22,f23 java-1.7.0-openjdk-headless # NOPRIME rhel7 -java-1.8.0-openjdk-headless # NOPRIME f21,f22 +java-1.8.0-openjdk-headless # NOPRIME f21,f22,f23 libffi-devel libjpeg-turbo-devel # Pillow 3.0.0 libxml2-devel # lxml diff --git a/lib/ceph b/lib/ceph index 29d2aca54f..f573136a4e 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) ]]; then + if [[ ! ${DISTRO} =~ (trusty|f21|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/stack.sh b/stack.sh index a3d943a4df..537f81e253 100755 --- a/stack.sh +++ b/stack.sh @@ -192,7 +192,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} =~ (precise|trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f21|f22|rhel7) ]]; then +if [[ ! ${DISTRO} =~ (precise|trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f21|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"