From 8bb346420d3d5d69fc37300fb47c7dcfb7534bc9 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 23 Aug 2017 07:10:04 +0100 Subject: [PATCH] Fix MariaDB apt package pinning The variables in vars are only loaded when the include_vars task is run, which is after meta-dependencies are processed. This patch ensures that the pinning is properly applied when the meta-dependent role is executed. Closes-Bug: #1712315 Change-Id: Ibc7766e96e478250b5e7d4788bb56dace974d25f (cherry picked from commit c24d590d8acf808134e846f36a84fb23e88bd4ef) --- defaults/main.yml | 3 +++ vars/ubuntu-14.04.yml | 2 -- vars/ubuntu-16.04.yml | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 36e7a882..11ae44e7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -135,6 +135,9 @@ qpress_package_url: "{{ qpress_arch_url.get( galera_package_arch | lower ) }}" qpress_package_sha256: "{{ qpress_arch_sha256.get( galera_package_arch | lower ) }}" qpress_package_path: "/opt/{{ qpress_package_url | basename }}" +# This is only applied if the ansible_pkg_mgr is 'apt' +galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }] + # Galera Server SSL functionality. galera_use_ssl: false diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index ed734d1f..03670a16 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -16,8 +16,6 @@ ## APT Cache Options cache_timeout: 600 -galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }] - # Galera GPG Keys _galera_gpg_keys: - key_name: 'mariadb' diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 392c1ffc..801aec6f 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -16,8 +16,6 @@ ## APT Cache Options cache_timeout: 600 -galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }] - # Galera GPG Keys _galera_gpg_keys: - key_name: 'mariadb'