Fix Maria-DB installation for centos7
Closes-Bug: #1658703 Change-Id: If13a2008c1b349b22f2247479f9128987c8fe45b
This commit is contained in:
parent
36186854c1
commit
488633b085
@ -218,7 +218,9 @@ class BaseConfigurer(ac.AbstractConfigurer):
|
||||
name=_("Configure database"))
|
||||
def decorated():
|
||||
distro_name = cluster_context.distro.name
|
||||
mysql.MySQL.install_mysql(mysql_instance, distro_name)
|
||||
distro_version = cluster_context.distro_version
|
||||
mysql.MySQL.install_mysql(mysql_instance, distro_name,
|
||||
distro_version)
|
||||
mysql.MySQL.start_mysql_server(cluster_context)
|
||||
mysql.MySQL.create_databases(cluster_context, instances)
|
||||
|
||||
|
@ -15,8 +15,11 @@ if [ ! -f /etc/init.d/mysql* ]; then
|
||||
sudo service mysql restart
|
||||
elif [[ $1 == *"CentOS"* ]] || \
|
||||
[[ $1 == "RedHatEnterpriseServer" ]]; then
|
||||
if [[ $2 == "7" ]]; then
|
||||
sudo yum install -y mariadb-server
|
||||
else
|
||||
sudo yum install -y mysql-server
|
||||
sudo yum install -y mysql-connector-java
|
||||
fi
|
||||
elif [[ $1 == *"SUSE"* ]]; then
|
||||
sudo zypper mysql-server
|
||||
else
|
||||
|
@ -3,7 +3,7 @@
|
||||
if [[ $1 == *"Ubuntu"* ]]; then
|
||||
sudo apt-get install --force-yes -y mysql-client libmysql-java
|
||||
elif [[ $1 == *"CentOS"* ]] || [[ $1 == "RedHatEnterpriseServer" ]]; then
|
||||
sudo yum install -y mysql mysql-connector-java
|
||||
sudo yum install -y mysql
|
||||
elif [[ $1 == *"SUSE"* ]]; then
|
||||
sudo zypper install mysql-community-server-client mysql-connector-java
|
||||
else
|
||||
|
@ -202,5 +202,6 @@ class MySQL(s.Service):
|
||||
MySQL._execute_script(instance, script.remote_path, script.render())
|
||||
|
||||
@staticmethod
|
||||
def install_mysql(instance, distro_name):
|
||||
g.run_script(instance, MySQL.MYSQL_INSTALL_SCRIPT, 'root', distro_name)
|
||||
def install_mysql(instance, distro_name, distro_version):
|
||||
g.run_script(instance, MySQL.MYSQL_INSTALL_SCRIPT, 'root', distro_name,
|
||||
distro_version.split('.')[0])
|
||||
|
Loading…
Reference in New Issue
Block a user