From 090240e9e7b4872255686b9cfa86ab26b494cb84 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Fri, 29 Apr 2016 00:06:33 -0500
Subject: [PATCH] Use the apt_package_pinning role

Add the galera_apt_pinned_packages default variable which is passed to
the apt_package_pinning role, instead of a template within this role, to
pin the MariaDB repo.

Change-Id: Iea8b002b57fa72230056656f42eaa75e84e9b5a6
---
 defaults/main.yml            |  2 ++
 meta/main.yml                |  2 ++
 tasks/galera_pre_install.yml | 10 ----------
 templates/galera_pin.pref.j2 |  5 -----
 4 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 templates/galera_pin.pref.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index a90a81c5..56261bd0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -94,6 +94,8 @@ galera_package_url: "https://www.percona.com/downloads/XtraBackup/Percona-XtraBa
 galera_package_sha256: "2f58eedefa905583f0650f77bb2b149139c4066c7fb690202124fe5c7ac83e9e"
 galera_package_path: "/opt/{{ galera_package_url | basename }}"
 
+galera_apt_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
+
 # Validate SSL certificates when downloading the galera deb above
 # May be set to "no" when proxy server is intercepting the certificates.
 galera_package_download_validate_certs: "yes"
diff --git a/meta/main.yml b/meta/main.yml
index b1cee080..75d2b72a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -31,6 +31,8 @@ galaxy_info:
     - openstack
 dependencies:
   - role: apt_package_pinning
+    apt_pinned_packages: "{{ galera_apt_pinned_packages }}"
+    apt_package_pinning_file_name: "galera_pin.pref"
     when:
       - ansible_pkg_mgr == 'apt'
   - role: galera_client
diff --git a/tasks/galera_pre_install.yml b/tasks/galera_pre_install.yml
index 3d422e1e..65bcba0a 100644
--- a/tasks/galera_pre_install.yml
+++ b/tasks/galera_pre_install.yml
@@ -73,16 +73,6 @@
   tags:
     - galera-apt-keys
 
-- name: Drop galera repo pin
-  template:
-    src: "galera_pin.pref.j2"
-    dest: "/etc/apt/preferences.d/galera_pin.pref"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  tags:
-    - galera-repo-pin
-
 - name: Add galera repo(s)
   apt_repository:
     repo: "{{ item.repo }}"
diff --git a/templates/galera_pin.pref.j2 b/templates/galera_pin.pref.j2
deleted file mode 100644
index 0d2a6e5c..00000000
--- a/templates/galera_pin.pref.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-Package: *
-Pin: release o=MariaDB
-Pin-Priority: 1001