From 2f560bda96610c06195fe7f5f7ca67eff317a1f9 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@debianiste.org>
Date: Sun, 25 Sep 2016 13:50:30 +0200
Subject: [PATCH] Don't install percona repository (prevent APT conflicts)

---
 README.md                          | 1 -
 defaults/main.yml                  | 1 -
 tasks/install/main.yml             | 4 ----
 tasks/install/percona/upstream.yml | 5 -----
 tests/group_vars/all               | 1 -
 tests/test.yml                     | 1 -
 6 files changed, 13 deletions(-)

diff --git a/README.md b/README.md
index 61ca8d9..ab2dec9 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@ Role Variables
 
 - `mysql_origin`: origin of the package ("default" or "upstream")
 - `mysql_vendor`: "mysql", "mariadb", "mariadb\_galera" (only with MariaDB upstream 10.1) or "percona"
-- `mysql_use_percona_repository`: use percona APT repository (automatic setted to true if you use "percona" as `mysql_vendor`).
 
 ### Configuration
 
diff --git a/defaults/main.yml b/defaults/main.yml
index c984b8e..9d327d0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,7 +6,6 @@
 mysql_origin: 'default'
 mysql_vendor: 'mariadb'
 mysql_root_password: 'change_me_NOW'
-mysql_use_percona_repository: false
 
 # -------------------------------------
 # Configuration
diff --git a/tasks/install/main.yml b/tasks/install/main.yml
index 61e9939..0669994 100644
--- a/tasks/install/main.yml
+++ b/tasks/install/main.yml
@@ -11,10 +11,6 @@
     (mysql_origin ==  'upstream' and mysql_vendor == 'percona')
     )
 
-- name: APT | Install Percona Xtrabackup
-  include: percona/apt.yml
-  when: mysql_use_percona_repository
-
 - name: INCLUDE | Install MySQL from default repo
   include: 'mysql/default.yml'
   when: mysql_origin == 'default' and mysql_vendor == 'mysql'
diff --git a/tasks/install/percona/upstream.yml b/tasks/install/percona/upstream.yml
index 483d83c..b770490 100644
--- a/tasks/install/percona/upstream.yml
+++ b/tasks/install/percona/upstream.yml
@@ -1,12 +1,7 @@
 ---
 
-# We prevent double include
 - name: INCLUDE | Add percona APT repository
   include: apt.yml
-  when: not mysql_use_percona_repository
-
-- name: SET_FACT | We use percona repository
-  set_fact: mysql_use_percona_repository=true
 
 - name: DEBCONF | Prepare MySQL silent installation (root password)
   debconf: name='percona-server-server-{{ percona_version }}' question='percona-server-server/root_password' vtype='password' value='{{ mysql_root_password }}'
diff --git a/tests/group_vars/all b/tests/group_vars/all
index fea23c6..a728730 100644
--- a/tests/group_vars/all
+++ b/tests/group_vars/all
@@ -1,4 +1,3 @@
-mysql_use_percona_repository: true
 mysql_bind_address: '{{ ansible_eth1.ipv4.address }}'
 mysql_extra_configuration:
   innodb_commit_concurrency: 0
diff --git a/tests/test.yml b/tests/test.yml
index 473f94c..e0992b1 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -41,7 +41,6 @@
   vars:
     mysql_galera_primary_node: 'jessie-upstream-mariadbgalera-1'
     mysql_wsrep_node_address: "{{ ansible_eth1.ipv4.address }}"
-    mysql_use_percona_repository: false
     mariadb_version: '10.1'
   roles:
     - ../../