Browse code

Enable F22 without the FORCE flag

F22 has a stable release and working with devstack.

The change also removes the version flags regarding to the
mariadb-devel.

NOTE: You may see yum deprecation warnings, unless
you set the YUM variable to dnf.

Change-Id: I05140765bffc16faef5a29dfaba291c290bfae02

Attila Fazekas authored on 2015/05/28 22:38:01
Showing 3 changed files
... ...
@@ -1,8 +1,7 @@
1 1
 libffi-devel  # pyOpenSSL
2 2
 libxml2-devel  # lxml
3 3
 libxslt-devel  # lxml
4
-mariadb-devel  # MySQL-python  f20,f21,rhel7
5
-mysql-devel  # MySQL-python  rhel6
4
+mariadb-devel  # MySQL-python
6 5
 openssl-devel  # pyOpenSSL
7 6
 postgresql-devel  # psycopg2
8 7
 python-devel  # pyOpenSSL
... ...
@@ -110,7 +110,7 @@ function undefine_virsh_secret {
110 110
 
111 111
 # check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
112 112
 function check_os_support_ceph {
113
-    if [[ ! ${DISTRO} =~ (trusty|f20|f21) ]]; then
113
+    if [[ ! ${DISTRO} =~ (trusty|f20|f21|f22) ]]; then
114 114
         echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)"
115 115
         if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
116 116
             die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"
... ...
@@ -173,7 +173,7 @@ source $TOP_DIR/stackrc
173 173
 
174 174
 # Warn users who aren't on an explicitly supported distro, but allow them to
175 175
 # override check and attempt installation with ``FORCE=yes ./stack``
176
-if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|rhel7) ]]; then
176
+if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|f22|rhel7) ]]; then
177 177
     echo "WARNING: this script has not been tested on $DISTRO"
178 178
     if [[ "$FORCE" != "yes" ]]; then
179 179
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"