From 22a87ddf74099780a3ed457de1be01947cf93978 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 23 May 2017 22:39:07 +0100
Subject: [PATCH] vars: main: Split percona packages from the galera server
 ones.

The role uses the 'use_percona_upstream' variable to determine if
specific external packages are going to be used instead of the distro or
upstream ones. The {qpress,percona}_package_path variables only make sense
if we are going to use such external packages so we convert their static
declaration into a 'set_fact' task. This also allows distributions to
override the default package list with an empty list if they do not plan
to use local percona packages.

Change-Id: Icb65f6c8c1654e24f73e1e5310516cd9b3568aad
---
 tasks/galera_install.yml     | 4 ++++
 tasks/galera_install_apt.yml | 4 ++--
 tasks/galera_install_yum.yml | 2 +-
 vars/main.yml                | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tasks/galera_install.yml b/tasks/galera_install.yml
index e0562552..3c7f87ee 100644
--- a/tasks/galera_install.yml
+++ b/tasks/galera_install.yml
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Add percona external packages to the galera packages list
+  set_fact:
+    galera_install_packages_list: "{{ galera_packages_list | union(percona_packages_list) }}"
+
 - include: "galera_install_{{ ansible_pkg_mgr }}.yml"
   tags:
     - install-apt
diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index 7a79aae1..919fc182 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -104,14 +104,14 @@
     update_cache: yes
     cache_valid_time: "{{ (add_repos | changed) | ternary('0', cache_timeout) }}"
   with_items:
-    - "{{ galera_packages_list | selectattr('enabled') | rejectattr('local_pkg') | sum(attribute='packages', start=[]) }}"
+    - "{{ galera_install_packages_list | selectattr('enabled') | rejectattr('local_pkg') | sum(attribute='packages', start=[]) }}"
 
 - name: Install galera_server role local packages (apt)
   apt:
     deb: "{{ item }}"
     force: yes
   with_items:
-    - "{{ galera_packages_list | selectattr('enabled') | selectattr('local_pkg') | sum(attribute='packages', start=[]) }}"
+    - "{{ galera_install_packages_list | selectattr('enabled') | selectattr('local_pkg') | sum(attribute='packages', start=[]) }}"
 
 - name: Remove policy-rc
   file:
diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml
index 4779dda3..7ca67561 100644
--- a/tasks/galera_install_yum.yml
+++ b/tasks/galera_install_yum.yml
@@ -96,7 +96,7 @@
     name: "{{ item }}"
     state: "{{ galera_server_package_state }}"
   with_items:
-    - "{{ galera_packages_list | selectattr('enabled') | sum(attribute='packages', start=[]) }}"
+    - "{{ galera_install_packages_list | selectattr('enabled') | sum(attribute='packages', start=[]) }}"
 
 - name: Enable mysql to start at boot
   service:
diff --git a/vars/main.yml b/vars/main.yml
index 7dfa3d20..a122ae33 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -23,6 +23,8 @@ galera_packages_list:
   - packages: "{{ galera_server_percona_distro_packages }}"
     enabled: "{{ use_percona_upstream }}"
     local_pkg: no
+
+percona_packages_list:
   - packages: "{{ [percona_package_path] }}"
     enabled: "{{ not use_percona_upstream }}"
     local_pkg: yes