From 96500a6e3328fb825c92d2d22c86da89f4a14bfa Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Mon, 22 Aug 2016 16:00:45 +0300 Subject: [PATCH] roles/mariadb: Use Ubuntu 16.04 (xenial) builds When I originally deployed Ubuntu 16.04 there were no public xenial MariaDB builds yet, so I used wily (15.10). Now there are official xenial builds so we can use them instead. --- roles/mariadb/tasks/main.yml | 2 +- roles/mariadb/templates/mariadb.list.j2 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index 02918cb..d02c38f 100644 --- a/roles/mariadb/tasks/main.yml +++ b/roles/mariadb/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Add GPG key for MariaDB repo - apt_key: id=0xcbcb082a1bb943db url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcbcb082a1bb943db + apt_key: id=0xF1656F24C74CD1D8 url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF1656F24C74CD1D8 tags: mariadb, packages - name: Remove old repo file diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2 index 36fbfd5..7ae37c7 100644 --- a/roles/mariadb/templates/mariadb.list.j2 +++ b/roles/mariadb/templates/mariadb.list.j2 @@ -1,8 +1,7 @@ # {{ ansible_managed }} -{% if ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04' %} +{% if ansible_distribution == 'Ubuntu' %} -# there are no xenial builds yet, so use wily -deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.1/ubuntu wily main +deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.1/ubuntu {{ ansible_distribution_release }} main {% elif ansible_distribution == 'Debian' %}