@@ -3,4 +3,4 @@ scsi-target-utils

 qemu-img

 postgresql-devel

 iscsi-initiator-utils

-python-lxml         #dist:f19,f20,rhel7

+python-lxml         #dist:f19,f20,f21,rhel7

@@ -6,10 +6,10 @@ postgresql-devel    # testonly

 python-argparse

 python-eventlet

 python-greenlet

-python-lxml         #dist:f19,f20,rhel7

-python-paste-deploy #dist:f19,f20,rhel7

+python-lxml         #dist:f19,f20,f21,rhel7

+python-paste-deploy #dist:f19,f20,f21,rhel7

 python-routes

 python-sqlalchemy

-python-wsgiref      #dist:f18,f19,f20

+python-wsgiref      #dist:f18,f19,f20,f21

 pyxattr

 zlib-devel          # testonly

@@ -12,8 +12,8 @@ python-httplib2

 python-migrate

 python-mox

 python-nose

-python-paste        #dist:f19,f20

-python-paste-deploy #dist:f19,f20

+python-paste        #dist:f19,f20,f21

+python-paste-deploy #dist:f19,f20,f21

 python-routes

 python-sphinx

 python-sqlalchemy

@@ -1,10 +1,10 @@

 MySQL-python

 python-greenlet

-libxslt-devel       # dist:f20

-python-lxml         #dist:f19,f20

-python-paste        #dist:f19,f20

-python-paste-deploy #dist:f19,f20

-python-paste-script #dist:f19,f20

+libxslt-devel       # dist:f20,f21

+python-lxml         #dist:f19,f20,f21

+python-paste        #dist:f19,f20,f21

+python-paste-deploy #dist:f19,f20,f21

+python-paste-script #dist:f19,f20,f21

 python-routes

 python-sqlalchemy

 python-webob

@@ -12,8 +12,8 @@ python-eventlet

 python-greenlet

 python-iso8601

 #rhel6 gets via pip

-python-paste        # dist:f19,f20,rhel7

-python-paste-deploy # dist:f19,f20,rhel7

+python-paste        # dist:f19,f20,f21,rhel7

+python-paste-deploy # dist:f19,f20,f21,rhel7

 python-qpid # NOPRIME

 python-routes

 python-sqlalchemy

@@ -29,11 +29,11 @@ python-iso8601

 python-lockfile

 python-migrate

 python-mox

-python-paramiko # dist:f19,f20,rhel7

+python-paramiko # dist:f19,f20,f21,rhel7

 # ^ on RHEL6, brings in python-crypto which conflicts with version from

 # pip we need

-python-paste        # dist:f19,f20,rhel7

-python-paste-deploy # dist:f19,f20,rhel7

+python-paste        # dist:f19,f20,f21,rhel7

+python-paste-deploy # dist:f19,f20,f21,rhel7

 python-qpid # NOPRIME

 python-routes

 python-sqlalchemy

@@ -6,7 +6,7 @@ python-eventlet

 python-greenlet

 python-netifaces

 python-nose

-python-paste-deploy # dist:f19,f20,rhel7

+python-paste-deploy # dist:f19,f20,f21,rhel7

 python-simplejson

 python-webob

 pyxattr

@@ -26,10 +26,10 @@ function cleanup_database_mysql {

         sudo rm -rf /etc/mysql

         return

     elif is_fedora; then

-        if [[ $DISTRO =~ (rhel7) ]]; then

-            MYSQL=mariadb

-        else

+        if [[ $DISTRO =~ (rhel6) ]]; then

             MYSQL=mysqld

+        else

+            MYSQL=mariadb

         fi

     elif is_suse; then

         MYSQL=mysql

@@ -54,10 +54,10 @@ function configure_database_mysql {

         my_conf=/etc/mysql/my.cnf

         mysql=mysql

     elif is_fedora; then

-        if [[ $DISTRO =~ (rhel7) ]]; then

-            mysql=mariadb

-        else

+        if [[ $DISTRO =~ (rhel6) ]]; then

             mysql=mysqld

+        else

+            mysql=mariadb

         fi

         my_conf=/etc/my.cnf

     elif is_suse; then

@@ -142,10 +142,10 @@ EOF

     fi

     # Install mysql-server

     if is_ubuntu || is_fedora; then

-        if [[ $DISTRO =~ (rhel7) ]]; then

-            install_package mariadb-server

-        else

+        if [[ $DISTRO =~ (rhel6) ]]; then

             install_package mysql-server

+        else

+            install_package mariadb-server

         fi

     elif is_suse; then

         if ! is_package_installed mariadb; then

@@ -143,7 +143,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|f19|f20|rhel6|rhel7) ]]; then

+if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|f21|rhel6|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"