From e105aff3a3ab57a1209dc31aa868e17c7d4b4c9e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 6 Sep 2019 13:17:37 +0200 Subject: [PATCH] Fix MariaDB variable --- wo/cli/plugins/stack.py | 12 +----------- wo/core/variables.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index c1e9b02..d430ff8 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -229,17 +229,7 @@ class WOStackController(CementBaseController): pargs.mysqltuner = True Log.debug(self, "Setting apt_packages variable for MySQL") if not WOShellExec.cmd_exec(self, "mysqladmin ping"): - if not WOVariables.wo_distro == 'raspbian': - if (not WOVariables.wo_platform_codename == 'jessie'): - wo_mysql = ["mariadb-server", "percona-toolkit", - "python3-mysqldb", "mariadb-backup"] - else: - wo_mysql = ["mariadb-server", "percona-toolkit", - "python3-mysql.connector"] - else: - wo_mysql = ["mariadb-server", "percona-toolkit", - "python3-mysqldb"] - apt_packages = apt_packages + wo_mysql + apt_packages = apt_packages + WOVariables.wo_mysql else: Log.debug(self, "MySQL already installed and alive") Log.info(self, "MySQL already installed and alive") diff --git a/wo/core/variables.py b/wo/core/variables.py index 69b223c..5e9b19b 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -145,6 +145,17 @@ class WOVariables(): "10.3/debian {codename} main" .format(codename=wo_platform_codename)) + if not wo_distro == 'raspbian': + if (not wo_platform_codename == 'jessie'): + wo_mysql = ["mariadb-server", "percona-toolkit", + "python3-mysqldb", "mariadb-backup"] + else: + wo_mysql = ["mariadb-server", "percona-toolkit", + "python3-mysql.connector"] + else: + wo_mysql = ["mariadb-server", "percona-toolkit", + "python3-mysqldb"] + if wo_platform_codename == 'jessie': wo_mysql_client = ["mariadb-client", "python3-mysqldb"] else: