Merge "vars: main: Split percona packages from the galera server ones."

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

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:

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:

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