From 1b5d18ca09e2476d9774e1c6dbd371a857eefdfe Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 15 Aug 2017 14:02:57 +0100 Subject: [PATCH] Toggle percona repo without extra-vars Currently overriding this setting requires the use of extra-vars. This change allows it to be done via any other variable override. Change-Id: I842fecfcf851b026c008f4fd1296c790bd00c5cc --- defaults/main.yml | 3 +++ vars/redhat-7.yml | 2 +- vars/suse-42.yml | 2 +- vars/ubuntu-16.04.yml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 49c1b5a7..ac3030ba 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -59,6 +59,9 @@ galera_percona_xtrabackup_repo_url: "{{ _galera_percona_xtrabackup_repo_url | de # Set the rpo information for the Percona Xtrabackup repository galera_percona_xtrabackup_repo: "{{ _galera_percona_xtrabackup_repo | default({}) }}" +# Enable the use of the upstream percona repo +use_percona_upstream: "{{ _use_percona_upstream }}" + galera_existing_cluster: true galera_running_and_bootstrapped: false diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 1a0087c0..47009489 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -80,4 +80,4 @@ qpress_arch_sha256: galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so" -use_percona_upstream: yes +_use_percona_upstream: yes diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 3759878e..e601944f 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -48,7 +48,7 @@ galera_server_mariadb_distro_packages: galera_wsrep_provider: "/usr/lib64/galera-3/libgalera_smm.so" -use_percona_upstream: true +_use_percona_upstream: yes # NOTE(hwoarang): The default one provided in vars/main.yml depends on # variables defined in defaults/main.yml. However such defaults do not make # sense for SUSE distributions and as such we provide an empty list here since diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 4b849591..71cb0ee9 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -115,4 +115,4 @@ _galera_repo: galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so" -use_percona_upstream: no +_use_percona_upstream: no