From 5e38bc02a0d11a9f7a3cb9f850d086ee34f61ff6 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Fri, 23 Sep 2016 09:38:19 +0200 Subject: [PATCH] Drop wheezy support --- README.md | 4 ++-- Vagrantfile | 6 ------ meta/main.yml | 1 - tasks/install/main.yml | 6 ++---- tests/README.md | 4 +--- tests/debian-wheezy.Dockerfile | 4 ---- tests/gen.pl | 6 ------ tests/host_vars/wheezy-default-mysql-slave | 1 - tests/host_vars/wheezy-upstream-mariadb-slave | 1 - tests/host_vars/wheezy-upstream-percona-slave | 1 - 10 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 tests/debian-wheezy.Dockerfile delete mode 100644 tests/host_vars/wheezy-default-mysql-slave delete mode 100644 tests/host_vars/wheezy-upstream-mariadb-slave delete mode 100644 tests/host_vars/wheezy-upstream-percona-slave diff --git a/README.md b/README.md index 4801a6d..601a7d6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Role Variables - `mysql_origin`: origin of the package ("default" or "upstream") - `mysql_vendor`: "mysql", "mariadb" or "percona" -- `mysql_use_percona_repository`: use percona APT repository (automatic setted to true if you use "percona" as `mysql_vendor`). You need to set "true" on Wheezy if you want to install percona-xtrabackup. +- `mysql_use_percona_repository`: use percona APT repository (automatic setted to true if you use "percona" as `mysql_vendor`). ### Configuration @@ -46,7 +46,7 @@ Check "priv" syntax in [mysql_user module documentation](http://docs.ansible.com ### Packaging -- `mariadb_version`: 5.5 (Debian Wheezy only) or 10.0 +- `mariadb_version`: 10.0/10.1 - `mariadb_repository`: MariaDB upstream APT repository (see: [MariaDB repositories tool](http://mariadb.org/mariadb/repositories/)) - `percona_version`: Percona version 5.5 or 5.6 - `percona_repository`: Percona upstream APT repository (see: [Percona APT doc](http://www.percona.com/doc/percona-server/5.5/installation/apt_repo.html)) diff --git a/Vagrantfile b/Vagrantfile index d8b75cb..e755a47 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,12 +6,6 @@ Vagrant.configure("2") do |config| vms = [ - ["wheezy-default-mysql-master", "deb/wheezy-amd64", "192.168.200.10", ["wheezy","default","mysql","master"]], - ["wheezy-default-mysql-slave", "deb/wheezy-amd64", "192.168.200.11", ["wheezy","default","mysql","slave"]], - ["wheezy-upstream-mariadb-master", "deb/wheezy-amd64", "192.168.200.12", ["wheezy","upstream","mariadb","master"]], - ["wheezy-upstream-mariadb-slave", "deb/wheezy-amd64", "192.168.200.13", ["wheezy","upstream","mariadb","slave"]], - ["wheezy-upstream-percona-master", "deb/wheezy-amd64", "192.168.200.14", ["wheezy","upstream","percona","master"]], - ["wheezy-upstream-percona-slave", "deb/wheezy-amd64", "192.168.200.15", ["wheezy","upstream","percona","slave"]], ["jessie-default-mysql-master", "debian/jessie64", "192.168.200.16", ["jessie","default","mysql","master"]], ["jessie-default-mysql-slave", "debian/jessie64", "192.168.200.17", ["jessie","default","mysql","slave"]], ["jessie-upstream-mariadb-master", "debian/jessie64", "192.168.200.18", ["jessie","upstream","mariadb","master"]], diff --git a/meta/main.yml b/meta/main.yml index 617daea..ee44aaa 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,7 +8,6 @@ galaxy_info: platforms: - name: Debian versions: - - wheezy - jessie galaxy_tags: - database diff --git a/tasks/install/main.yml b/tasks/install/main.yml index 7767df4..8e7e4db 100644 --- a/tasks/install/main.yml +++ b/tasks/install/main.yml @@ -5,7 +5,7 @@ when: > not ( (mysql_origin == 'default' and mysql_vendor == 'mysql') or - (mysql_origin == 'default' and mysql_vendor == 'mariadb' and ansible_distribution_major_version > 7) or + (mysql_origin == 'default' and mysql_vendor == 'mariadb') or (mysql_origin == 'upstream' and mysql_vendor == 'mariadb') or (mysql_origin == 'upstream' and mysql_vendor == 'percona') ) @@ -20,7 +20,7 @@ - name: INCLUDE | Install MariaDB from Debian repo include: 'mariadb/default.yml' - when: mysql_origin == 'default' and mysql_vendor == 'mariadb' and ansible_distribution_major_version > 7 + when: mysql_origin == 'default' and mysql_vendor == 'mariadb' - name: INCLUDE | Install MariaDB from MariaDB repo include: 'mariadb/upstream.yml' @@ -40,5 +40,3 @@ - name: APT | Install Percona Xtrabackup apt: pkg=percona-xtrabackup state=present - when: ansible_distribution_major_version > 7 or mysql_use_percona_repository - diff --git a/tests/README.md b/tests/README.md index 23d30ad..c050cf9 100644 --- a/tests/README.md +++ b/tests/README.md @@ -5,10 +5,9 @@ IMPORTANT --------- - DO NOT `vagrant up`! My Vagrantfile provides 14 VMs (256MB each)... -- Each slave communicate to his master. You can't mix jessie and wheezy or mysql and mariadb. +- Each slave communicate to his master. You can't mix mysql and mariadb. - This tests uses my [MySQL role](https://github.com/HanXHX/ansible-mysql). - Tests ----- @@ -28,7 +27,6 @@ vagrant up jessie-upstream-mariadb-slave Supported platforms ------------------- -- Debian Wheezy - Debian Jessie Supported MySQL vendors diff --git a/tests/debian-wheezy.Dockerfile b/tests/debian-wheezy.Dockerfile deleted file mode 100644 index bc45db9..0000000 --- a/tests/debian-wheezy.Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM williamyeh/ansible:debian7-onbuild - -RUN apt-get update -CMD ["sh", "tests/test.sh"] diff --git a/tests/gen.pl b/tests/gen.pl index 5de9ffc..fc88970 100755 --- a/tests/gen.pl +++ b/tests/gen.pl @@ -9,12 +9,6 @@ use warnings; use Socket; my @a = ( - "wheezy-default-mysql-master", - "wheezy-default-mysql-slave", - "wheezy-upstream-mariadb-master", - "wheezy-upstream-mariadb-slave", - "wheezy-upstream-percona-master", - "wheezy-upstream-percona-slave", "jessie-default-mysql-master", "jessie-default-mysql-slave", "jessie-upstream-mariadb-master", diff --git a/tests/host_vars/wheezy-default-mysql-slave b/tests/host_vars/wheezy-default-mysql-slave deleted file mode 100644 index b9a7abf..0000000 --- a/tests/host_vars/wheezy-default-mysql-slave +++ /dev/null @@ -1 +0,0 @@ -his_master: '192.168.200.10' diff --git a/tests/host_vars/wheezy-upstream-mariadb-slave b/tests/host_vars/wheezy-upstream-mariadb-slave deleted file mode 100644 index 5a0ff93..0000000 --- a/tests/host_vars/wheezy-upstream-mariadb-slave +++ /dev/null @@ -1 +0,0 @@ -his_master: '192.168.200.12' diff --git a/tests/host_vars/wheezy-upstream-percona-slave b/tests/host_vars/wheezy-upstream-percona-slave deleted file mode 100644 index ed31632..0000000 --- a/tests/host_vars/wheezy-upstream-percona-slave +++ /dev/null @@ -1 +0,0 @@ -his_master: '192.168.200.14'