From 3524b8352f0728b2955a002540a4fc4646159132 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 8 Feb 2018 10:06:09 +0000 Subject: [PATCH] Prevent latest mariadb version Latest mariadb version has a bug that prevents clustering from behaving properly in bootstrap. This setups the repo for the galera_client to the same as galera_server, to have the same client version. Change-Id: Ia1d7a2c664c6c11ad698a915162281c11a344067 --- defaults/main.yml | 1 + vars/redhat-7.yml | 2 +- vars/suse-42.yml | 2 +- vars/ubuntu-16.04.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9a3cefb..16feb65 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,6 +24,7 @@ galera_client_repo_url: "{{ galera_repo_url | default(_galera_client_repo_url) } # Set the major version to use for the galera repo galera_client_major_version: 10.1 +galera_client_minor_version: 30 # Set the repo information for the MariaDB repository galera_client_repo: "{{ _galera_client_repo }}" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 352f789..cde5e6b 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -16,7 +16,7 @@ # TODO(odyssey4me): # The use of 'galera_client_yum_repo_url' below is for backwards compatibility # to settings released in Newton. It can be removed in Queens. -_galera_client_repo_url: "{{ galera_client_yum_repo_url | default('http://yum.mariadb.org/' ~ galera_client_major_version ~ '/centos7-amd64/') }}" +_galera_client_repo_url: "{{ galera_client_yum_repo_url | default('https://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/yum/centos7-amd64/') }}" _galera_client_repo: state: "present" name: MariaDB diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 4e0dfc8..ab8adea 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -_galera_client_repo_url: "http://yum.mariadb.org/{{ galera_client_major_version }}/sles/12/x86_64" +_galera_client_repo_url: "https://downloads.mariadb.com/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/yum/opensuse42-amd64" _galera_client_repo: name: MariaDB description: "MariaDB Repo" diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 75273d8..5405790 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -17,7 +17,7 @@ # TODO(odyssey4me): # The use of 'galera_client_apt_repo_url' below is for backwards compatibility # to settings released in Newton. It can be removed in Queens. -_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://mirror.rackspace.com/mariadb/repo/' ~ galera_client_major_version ~ '/ubuntu') }}" +_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('https://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/repo/ubuntu') }}" _galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main" galera_client_distro_packages: