From 6d20f09045dba237caf50d8d55dcc90a9f105ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Sedl=C3=A1k?= Date: Wed, 22 Oct 2014 15:34:46 +0200 Subject: [PATCH] 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 --- files/rpms/cinder | 2 +- files/rpms/glance | 6 +++--- files/rpms/horizon | 4 ++-- files/rpms/keystone | 10 +++++----- files/rpms/neutron | 4 ++-- files/rpms/nova | 6 +++--- files/rpms/swift | 2 +- lib/databases/mysql | 18 +++++++++--------- stack.sh | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/files/rpms/cinder b/files/rpms/cinder index ce6181eedf..eedff184dd 100644 --- a/files/rpms/cinder +++ b/files/rpms/cinder @@ -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 diff --git a/files/rpms/glance b/files/rpms/glance index 5a7f073f35..d2792cf987 100644 --- a/files/rpms/glance +++ b/files/rpms/glance @@ -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 diff --git a/files/rpms/horizon b/files/rpms/horizon index 7add23a549..1d06ac278b 100644 --- a/files/rpms/horizon +++ b/files/rpms/horizon @@ -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 diff --git a/files/rpms/keystone b/files/rpms/keystone index ce41ee598b..8b0953dd69 100644 --- a/files/rpms/keystone +++ b/files/rpms/keystone @@ -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 diff --git a/files/rpms/neutron b/files/rpms/neutron index 2c9dd3d5e8..f2473fb20d 100644 --- a/files/rpms/neutron +++ b/files/rpms/neutron @@ -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 diff --git a/files/rpms/nova b/files/rpms/nova index f3261c6ae0..07f13c7071 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -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 diff --git a/files/rpms/swift b/files/rpms/swift index 9ec4aab8ce..ccda22bcc8 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -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 diff --git a/lib/databases/mysql b/lib/databases/mysql index 67bf85ac97..7a444a3140 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -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 diff --git a/stack.sh b/stack.sh index 38ecceb717..8e05ae6322 100755 --- a/stack.sh +++ b/stack.sh @@ -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"