Browse code
Initial support for Fedora 21
Initial support for Fedora 21. Add f21 to the distribution lists for
rpms, ensure "mariadb" is used over "mysqld" and enable it in the
distro check, as we have several reports of it working.
Tested with [1]
[1] http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
Change-Id: I97cbede806e5c00363c7174fa1e9f286de96aab6
Pavel Sedlák authored on 2014/10/22 22:34:46Showing 9 changed files
- files/rpms/cinder
- files/rpms/glance
- files/rpms/horizon
- files/rpms/keystone
- files/rpms/neutron
- files/rpms/nova
- files/rpms/swift
- lib/databases/mysql
- stack.sh
| ... | ... |
@@ -6,10 +6,10 @@ postgresql-devel # testonly |
| 6 | 6 |
python-argparse |
| 7 | 7 |
python-eventlet |
| 8 | 8 |
python-greenlet |
| 9 |
-python-lxml #dist:f19,f20,rhel7 |
|
| 10 |
-python-paste-deploy #dist:f19,f20,rhel7 |
|
| 9 |
+python-lxml #dist:f19,f20,f21,rhel7 |
|
| 10 |
+python-paste-deploy #dist:f19,f20,f21,rhel7 |
|
| 11 | 11 |
python-routes |
| 12 | 12 |
python-sqlalchemy |
| 13 |
-python-wsgiref #dist:f18,f19,f20 |
|
| 13 |
+python-wsgiref #dist:f18,f19,f20,f21 |
|
| 14 | 14 |
pyxattr |
| 15 | 15 |
zlib-devel # testonly |
| ... | ... |
@@ -12,8 +12,8 @@ python-httplib2 |
| 12 | 12 |
python-migrate |
| 13 | 13 |
python-mox |
| 14 | 14 |
python-nose |
| 15 |
-python-paste #dist:f19,f20 |
|
| 16 |
-python-paste-deploy #dist:f19,f20 |
|
| 15 |
+python-paste #dist:f19,f20,f21 |
|
| 16 |
+python-paste-deploy #dist:f19,f20,f21 |
|
| 17 | 17 |
python-routes |
| 18 | 18 |
python-sphinx |
| 19 | 19 |
python-sqlalchemy |
| ... | ... |
@@ -1,10 +1,10 @@ |
| 1 | 1 |
MySQL-python |
| 2 | 2 |
python-greenlet |
| 3 |
-libxslt-devel # dist:f20 |
|
| 4 |
-python-lxml #dist:f19,f20 |
|
| 5 |
-python-paste #dist:f19,f20 |
|
| 6 |
-python-paste-deploy #dist:f19,f20 |
|
| 7 |
-python-paste-script #dist:f19,f20 |
|
| 3 |
+libxslt-devel # dist:f20,f21 |
|
| 4 |
+python-lxml #dist:f19,f20,f21 |
|
| 5 |
+python-paste #dist:f19,f20,f21 |
|
| 6 |
+python-paste-deploy #dist:f19,f20,f21 |
|
| 7 |
+python-paste-script #dist:f19,f20,f21 |
|
| 8 | 8 |
python-routes |
| 9 | 9 |
python-sqlalchemy |
| 10 | 10 |
python-webob |
| ... | ... |
@@ -12,8 +12,8 @@ python-eventlet |
| 12 | 12 |
python-greenlet |
| 13 | 13 |
python-iso8601 |
| 14 | 14 |
#rhel6 gets via pip |
| 15 |
-python-paste # dist:f19,f20,rhel7 |
|
| 16 |
-python-paste-deploy # dist:f19,f20,rhel7 |
|
| 15 |
+python-paste # dist:f19,f20,f21,rhel7 |
|
| 16 |
+python-paste-deploy # dist:f19,f20,f21,rhel7 |
|
| 17 | 17 |
python-qpid # NOPRIME |
| 18 | 18 |
python-routes |
| 19 | 19 |
python-sqlalchemy |
| ... | ... |
@@ -29,11 +29,11 @@ python-iso8601 |
| 29 | 29 |
python-lockfile |
| 30 | 30 |
python-migrate |
| 31 | 31 |
python-mox |
| 32 |
-python-paramiko # dist:f19,f20,rhel7 |
|
| 32 |
+python-paramiko # dist:f19,f20,f21,rhel7 |
|
| 33 | 33 |
# ^ on RHEL6, brings in python-crypto which conflicts with version from |
| 34 | 34 |
# pip we need |
| 35 |
-python-paste # dist:f19,f20,rhel7 |
|
| 36 |
-python-paste-deploy # dist:f19,f20,rhel7 |
|
| 35 |
+python-paste # dist:f19,f20,f21,rhel7 |
|
| 36 |
+python-paste-deploy # dist:f19,f20,f21,rhel7 |
|
| 37 | 37 |
python-qpid # NOPRIME |
| 38 | 38 |
python-routes |
| 39 | 39 |
python-sqlalchemy |
| ... | ... |
@@ -26,10 +26,10 @@ function cleanup_database_mysql {
|
| 26 | 26 |
sudo rm -rf /etc/mysql |
| 27 | 27 |
return |
| 28 | 28 |
elif is_fedora; then |
| 29 |
- if [[ $DISTRO =~ (rhel7) ]]; then |
|
| 30 |
- MYSQL=mariadb |
|
| 31 |
- else |
|
| 29 |
+ if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 32 | 30 |
MYSQL=mysqld |
| 31 |
+ else |
|
| 32 |
+ MYSQL=mariadb |
|
| 33 | 33 |
fi |
| 34 | 34 |
elif is_suse; then |
| 35 | 35 |
MYSQL=mysql |
| ... | ... |
@@ -54,10 +54,10 @@ function configure_database_mysql {
|
| 54 | 54 |
my_conf=/etc/mysql/my.cnf |
| 55 | 55 |
mysql=mysql |
| 56 | 56 |
elif is_fedora; then |
| 57 |
- if [[ $DISTRO =~ (rhel7) ]]; then |
|
| 58 |
- mysql=mariadb |
|
| 59 |
- else |
|
| 57 |
+ if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 60 | 58 |
mysql=mysqld |
| 59 |
+ else |
|
| 60 |
+ mysql=mariadb |
|
| 61 | 61 |
fi |
| 62 | 62 |
my_conf=/etc/my.cnf |
| 63 | 63 |
elif is_suse; then |
| ... | ... |
@@ -142,10 +142,10 @@ EOF |
| 142 | 142 |
fi |
| 143 | 143 |
# Install mysql-server |
| 144 | 144 |
if is_ubuntu || is_fedora; then |
| 145 |
- if [[ $DISTRO =~ (rhel7) ]]; then |
|
| 146 |
- install_package mariadb-server |
|
| 147 |
- else |
|
| 145 |
+ if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 148 | 146 |
install_package mysql-server |
| 147 |
+ else |
|
| 148 |
+ install_package mariadb-server |
|
| 149 | 149 |
fi |
| 150 | 150 |
elif is_suse; then |
| 151 | 151 |
if ! is_package_installed mariadb; then |
| ... | ... |
@@ -143,7 +143,7 @@ source $TOP_DIR/stackrc |
| 143 | 143 |
|
| 144 | 144 |
# Warn users who aren't on an explicitly supported distro, but allow them to |
| 145 | 145 |
# override check and attempt installation with ``FORCE=yes ./stack`` |
| 146 |
-if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then
|
|
| 146 |
+if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|f21|rhel6|rhel7) ]]; then
|
|
| 147 | 147 |
echo "WARNING: this script has not been tested on $DISTRO" |
| 148 | 148 |
if [[ "$FORCE" != "yes" ]]; then |
| 149 | 149 |
die $LINENO "If you wish to run this script anyway run with FORCE=yes" |