openstack/devstack
Code Issues Proposed changes

Return mysql-server to default for all ubuntu installs

Browse Source 
Change: I97cbede806e5c00363c7174fa1e9f286de96aab6 altered
the logic in lib/databases/mysql from installing mariadb only if
one was using rhel7 to installing it by default unless one was using
rhel6.

Change: Iae9a7a1c09f1fc83573c3926b3470955c244c401
Attempted to fix this, but only does so for precise.

Unless mariadb has become the default, I strongly prefer to keep
standard mysql as the database on ubuntu (precise or otherwise).

Closes-Bug: 1395776

Change-Id: I3afb89ae6d55405313b7219dd6daa24d9ca80f70
This commit is contained in:
pcrews
2014-11-18 20:50:00 -08:00
parent a74ae5d713
commit 6de7dba863
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/databases/mysql
View File

@@ -141,12 +141,14 @@ EOF
chmod 0600 $HOME/.my.cnf
fi
# Install mysql-server
if is_ubuntu || is_fedora; then
if [[ $DISTRO =~ (rhel6|precise) ]]; then
if is_fedora; then
if [[ $DISTRO =~ (rhel6) ]]; then
install_package mysql-server
else
install_package mariadb-server
fi
elif is_ubuntu; then
install_package mysql-server
elif is_suse; then
if ! is_package_installed mariadb; then
install_package mysql-community-server