openstack/devstack
Code Issues Proposed changes

Add RHEL7 beta support

Browse Source 
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
This commit is contained in:
Attila Fazekas 2014-02-20 15:49:13 +01:00
parent 4fa0401d33
commit 2d65059e72
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/rpms/cinder
View File

@ -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

4
files/rpms/glance
View File

@ -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

4
files/rpms/neutron
View File

@ -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

8
files/rpms/nova
View File

@ -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

2
files/rpms/swift
View File

@ -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

18
lib/databases/mysql
View File

@ -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