From a733f8a369f4f440616ec6e278e4e6e7d1f4575d Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Thu, 15 Dec 2016 23:02:56 +0100 Subject: [PATCH] Add `mariadb` flavor --- mysql/README.md | 1 + mysql/defaults/main.yml | 3 ++- mysql/tasks/packages.yml | 16 ++++++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mysql/README.md b/mysql/README.md index 61d94595..d4bd34ee 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -18,6 +18,7 @@ Tasks are extracted in several files, included in `tasks/main.yml` : ## Available variables +* `mysql_use_mariadb` : use mariadb-server-10.0 instead of mysql-server ; * `mysql_replace_root_with_mysqladmin`: switch from `root` to `mysqladmin` user or not ; * `mysql_thread_cache_size`: number of threads for the cache ; * `mysql_innodb_buffer_pool_size`: amount of RAM dedicated to InnoDB ; diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml index 2e90bfb8..80acf274 100644 --- a/mysql/defaults/main.yml +++ b/mysql/defaults/main.yml @@ -1,3 +1,5 @@ +mysql_use_mariadb: False + mysql_replace_root_with_mysqladmin: true mysql_custom_datadir: '' @@ -6,7 +8,6 @@ mysql_custom_tmpdir: '' mysql_thread_cache_size: '{{ ansible_processor_cores }}' mysql_innodb_buffer_pool_size: '{{ (ansible_memtotal_mb * 0.3) | int }}M' - default_alert_mail: root general_alert_mail: Null log2mail_alert_mail: Null diff --git a/mysql/tasks/packages.yml b/mysql/tasks/packages.yml index 0ef7cbc1..77ebf2b6 100644 --- a/mysql/tasks/packages.yml +++ b/mysql/tasks/packages.yml @@ -1,11 +1,23 @@ --- -- name: Ensure MySQL packages are installed +- name: Ensure MySQL (Oracle version) packages are installed apt: - name: mysql-server + name: '{{ item }}' state: installed with_items: - mysql-server + when: mysql_use_mariadb == False + tags: + - mysql + - packages + +- name: Ensure MySQL (MariaDB version) packages are installed + apt: + name: '{{ item }}' + state: installed + with_items: + - mariadb-server-10.0 + when: mysql_use_mariadb tags: - mysql - packages