diff --git a/files/rpms/devlibs b/files/rpms/devlibs index 834a4b6cf1..385ed3b84c 100644 --- a/files/rpms/devlibs +++ b/files/rpms/devlibs @@ -1,8 +1,7 @@ libffi-devel # pyOpenSSL libxml2-devel # lxml libxslt-devel # lxml -mariadb-devel # MySQL-python f20,f21,rhel7 -mysql-devel # MySQL-python rhel6 +mariadb-devel # MySQL-python openssl-devel # pyOpenSSL postgresql-devel # psycopg2 python-devel # pyOpenSSL diff --git a/lib/ceph b/lib/ceph index 4068e26222..4d6ca4aa68 100644 --- a/lib/ceph +++ b/lib/ceph @@ -110,7 +110,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|f20|f21) ]]; then + if [[ ! ${DISTRO} =~ (trusty|f20|f21|f22) ]]; 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 dea56437dd..6615b8fef4 100755 --- a/stack.sh +++ b/stack.sh @@ -173,7 +173,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|7.0|wheezy|sid|testing|jessie|f20|f21|rhel7) ]]; then +if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|f22|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"