From 2d65059e725ad27d1e9bdddbea9982d1d8027c01 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Thu, 20 Feb 2014 15:49:13 +0100 Subject: [PATCH] Add RHEL7 beta support RHEL7 still in beta status, so it will require the FORCE option, until the GA release. The main notable difference from another RHEL family members, it does not have the mysql alias for the mariadb. Change-Id: Ic90bb6c3dd9447fc80453c3dc1adb22cdfc6226f --- files/rpms/cinder | 2 +- files/rpms/glance | 4 ++-- files/rpms/neutron | 4 ++-- files/rpms/nova | 8 ++++---- files/rpms/swift | 2 +- lib/databases/mysql | 18 +++++++++++++++--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/files/rpms/cinder b/files/rpms/cinder index 623c13e676..199ae10b79 100644 --- a/files/rpms/cinder +++ b/files/rpms/cinder @@ -4,4 +4,4 @@ qemu-img python-devel postgresql-devel iscsi-initiator-utils -python-lxml #dist:f18,f19,f20 +python-lxml #dist:f18,f19,f20,rhel7 diff --git a/files/rpms/glance b/files/rpms/glance index fffd9c85b4..785ce25df5 100644 --- a/files/rpms/glance +++ b/files/rpms/glance @@ -9,8 +9,8 @@ python-argparse python-devel python-eventlet python-greenlet -python-lxml #dist:f18,f19,f20 -python-paste-deploy #dist:f18,f19,f20 +python-lxml #dist:f18,f19,f20,rhel7 +python-paste-deploy #dist:f18,f19,f20,rhel7 python-routes python-sqlalchemy python-wsgiref diff --git a/files/rpms/neutron b/files/rpms/neutron index 67bf52350a..42d7f68d37 100644 --- a/files/rpms/neutron +++ b/files/rpms/neutron @@ -11,8 +11,8 @@ python-greenlet python-iso8601 python-kombu #rhel6 gets via pip -python-paste # dist:f18,f19,f20 -python-paste-deploy # dist:f18,f19,f20 +python-paste # dist:f18,f19,f20,rhel7 +python-paste-deploy # dist:f18,f19,f20,rhel7 python-qpid python-routes python-sqlalchemy diff --git a/files/rpms/nova b/files/rpms/nova index ac70ac5d6f..a607d925e1 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -28,11 +28,11 @@ python-kombu python-lockfile python-migrate python-mox -python-paramiko # dist:f18,f19,f20 -# ^ on RHEL, brings in python-crypto which conflicts with version from +python-paramiko # dist:f18,f19,f20,rhel7 +# ^ on RHEL6, brings in python-crypto which conflicts with version from # pip we need -python-paste # dist:f18,f19,f20 -python-paste-deploy # dist:f18,f19,f20 +python-paste # dist:f18,f19,f20,rhel7 +python-paste-deploy # dist:f18,f19,f20,rhel7 python-qpid python-routes python-sqlalchemy diff --git a/files/rpms/swift b/files/rpms/swift index 32432bca9b..72253f7752 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -9,7 +9,7 @@ python-eventlet python-greenlet python-netifaces python-nose -python-paste-deploy # dist:f18,f19,f20 +python-paste-deploy # dist:f18,f19,f20,rhel7 python-simplejson python-webob pyxattr diff --git a/lib/databases/mysql b/lib/databases/mysql index 476b4b91b7..31e7163033 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -25,7 +25,11 @@ function cleanup_database_mysql { sudo rm -rf /var/lib/mysql return elif is_fedora; then - MYSQL=mysqld + if [[ $DISTRO =~ (rhel7) ]]; then + MYSQL=mariadb + else + MYSQL=mysqld + fi elif is_suse; then MYSQL=mysql else @@ -48,8 +52,12 @@ function configure_database_mysql { MY_CONF=/etc/mysql/my.cnf MYSQL=mysql elif is_fedora; then + if [[ $DISTRO =~ (rhel7) ]]; then + MYSQL=mariadb + else + MYSQL=mysqld + fi MY_CONF=/etc/my.cnf - MYSQL=mysqld elif is_suse; then MY_CONF=/etc/my.cnf MYSQL=mysql @@ -135,7 +143,11 @@ EOF fi # Install mysql-server if is_ubuntu || is_fedora; then - install_package mysql-server + if [[ $DISTRO =~ (rhel7) ]]; then + install_package mariadb-server + else + install_package mysql-server + fi elif is_suse; then if ! is_package_installed mariadb; then install_package mysql-community-server