Merge "Use the apt_package_pinning role"

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"

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

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 }}"

templates/galera_pin.pref.j2

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-Package: *
-Pin: release o=MariaDB
-Pin-Priority: 1001