From 8126143815258be49c63b7fba59d32b8766f647d Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 7 May 2019 08:17:25 +0530 Subject: [PATCH] enhancement: provision to pass mariadb version --- bench/commands/install.py | 11 +++++++++-- playbooks/roles/mariadb/defaults/main.yml | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bench/commands/install.py b/bench/commands/install.py index 5a271bf4..e17ad08a 100644 --- a/bench/commands/install.py +++ b/bench/commands/install.py @@ -14,9 +14,16 @@ def install_prerequisites(): @click.command('mariadb') @click.option('--mysql_root_password') -def install_maridb(mysql_root_password=''): +@click.option('--version', default="10.2") +def install_maridb(mysql_root_password='', version=''): if mysql_root_password: - extra_vars.update({"mysql_root_password": mysql_root_password}) + extra_vars.update({ + "mysql_root_password": mysql_root_password, + }) + + extra_vars.update({ + "mariadb_version": version + }) run_playbook('site.yml', extra_vars=extra_vars, tag='mariadb') diff --git a/playbooks/roles/mariadb/defaults/main.yml b/playbooks/roles/mariadb/defaults/main.yml index 78831c10..dc98044e 100644 --- a/playbooks/roles/mariadb/defaults/main.yml +++ b/playbooks/roles/mariadb/defaults/main.yml @@ -1,6 +1,4 @@ --- -mariadb_version: 10.2 - mysql_conf_tpl: change_me mysql_conf_file: settings.cnf