From 17e28956f008af63598999883e10e2894e5454c5 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Mon, 28 Nov 2016 20:11:19 +0000
Subject: [PATCH] Don't install client packages via the galera_client role

The galera_server and galera_client roles both configure the apt or
yum repository for galera and percona. This can cause a conflict if
the version of the client and server differ.

This patch sets the galera_client dependency to deploy the /root/.my.cnf
file rather than installing all the client packages as well. The client
package is already deployed as part of the galera_server role
deployment.

Change-Id: I9534a02d4ce827a2f0fdf415a11e37808be941e5
Depends-On: I00d662a8afc7ddd4778787d31dc394a0ea3b1401
---
 defaults/main.yml        |  2 ++
 meta/main.yml            |  1 +
 tasks/galera_install.yml | 14 ++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3b4b4317..eef380b9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -85,6 +85,8 @@ galera_pip_packages:
   - MySQL-python
   - pycrypto
 
+galera_pip_package_state: "latest"
+
 # Galera slow/unindexed query logging
 galera_slow_query_logging: 0
 galera_unindexed_query_logging: 0
diff --git a/meta/main.yml b/meta/main.yml
index 6be923cb..ce8bbdc1 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -41,3 +41,4 @@ dependencies:
       - ansible_pkg_mgr == 'apt'
   - role: galera_client
     galera_client_drop_config_file: true
+    galera_client_package_install: false
diff --git a/tasks/galera_install.yml b/tasks/galera_install.yml
index 398370c1..1c3adab9 100644
--- a/tasks/galera_install.yml
+++ b/tasks/galera_install.yml
@@ -26,3 +26,17 @@
     - ansible_pkg_mgr == 'yum'
   tags:
     - install-yum
+
+- name: Install pip packages
+  pip:
+    name: "{{ galera_pip_packages }}"
+    state: "{{ galera_pip_package_state }}"
+    extra_args: >-
+      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      {{ pip_install_options | default('') }}
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  tags:
+    - galera-server-pip-packages