From 56e2f75599ef9c67360f058bc269bd2135950b67 Mon Sep 17 00:00:00 2001 From: James Robertson Date: Mon, 8 Jan 2018 23:38:18 -0600 Subject: [PATCH] MariaDB 10.2 (#510) MariaDB 10.2 Support --- playbooks/prerequisites/roles/mariadb/defaults/main.yml | 2 +- playbooks/prerequisites/roles/mariadb/tasks/debian.yml | 7 ++++++- .../roles/mariadb/templates/mariadb_centos.repo.j2 | 2 +- .../roles/mariadb/templates/mariadb_ubuntu.list.j2 | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/playbooks/prerequisites/roles/mariadb/defaults/main.yml b/playbooks/prerequisites/roles/mariadb/defaults/main.yml index a5bb87ff..78831c10 100644 --- a/playbooks/prerequisites/roles/mariadb/defaults/main.yml +++ b/playbooks/prerequisites/roles/mariadb/defaults/main.yml @@ -1,5 +1,5 @@ --- -mariadb_version: 10.0 +mariadb_version: 10.2 mysql_conf_tpl: change_me mysql_conf_file: settings.cnf diff --git a/playbooks/prerequisites/roles/mariadb/tasks/debian.yml b/playbooks/prerequisites/roles/mariadb/tasks/debian.yml index 526e3fa4..d4b905e4 100644 --- a/playbooks/prerequisites/roles/mariadb/tasks/debian.yml +++ b/playbooks/prerequisites/roles/mariadb/tasks/debian.yml @@ -9,7 +9,12 @@ - name: Add apt repository apt_repository: - repo: 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian {{ ansible_distribution_release }} main' + repo: 'deb [arch=amd64,i386] http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/debian {{ ansible_distribution_release }} main' + state: present + +- name: Add apt repository + apt_repository: + repo: 'deb-src [arch=amd64,i386] http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/debian {{ ansible_distribution_release }} main' state: present - name: Unattended package installation diff --git a/playbooks/prerequisites/roles/mariadb/templates/mariadb_centos.repo.j2 b/playbooks/prerequisites/roles/mariadb/templates/mariadb_centos.repo.j2 index 64738cc1..0a025305 100644 --- a/playbooks/prerequisites/roles/mariadb/templates/mariadb_centos.repo.j2 +++ b/playbooks/prerequisites/roles/mariadb/templates/mariadb_centos.repo.j2 @@ -1,4 +1,4 @@ -# MariaDB CentOS {{ ansible_distribution_major_version|int }} repository list +# MariaDB {{ mariadb_version }} CentOS {{ ansible_distribution_major_version|int }} repository list # http://mariadb.org/mariadb/repositories/ [mariadb] name = MariaDB diff --git a/playbooks/prerequisites/roles/mariadb/templates/mariadb_ubuntu.list.j2 b/playbooks/prerequisites/roles/mariadb/templates/mariadb_ubuntu.list.j2 index 981b4d6b..dca4e70b 100644 --- a/playbooks/prerequisites/roles/mariadb/templates/mariadb_ubuntu.list.j2 +++ b/playbooks/prerequisites/roles/mariadb/templates/mariadb_ubuntu.list.j2 @@ -1,4 +1,4 @@ -# MariaDB Ubuntu {{ ansible_distribution_release | title }} repository list +# MariaDB {{ mariadb_version }} Ubuntu {{ ansible_distribution_release | title }} repository list # http://mariadb.org/mariadb/repositories/ deb http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release | lower }} main deb-src http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release | lower }} main