diff --git a/defaults/main.yml b/defaults/main.yml index de3c1baf..b9bbd5d5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -40,8 +40,8 @@ galera_debconf_items: [] galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}" # The major version used to select the repo URL path -galera_major_version: 10.1 -galera_minor_version: 34 +galera_major_version: 10.2 +galera_minor_version: 17 # Set the URL for the MariaDB repository galera_repo_host: "downloads.mariadb.com" diff --git a/releasenotes/notes/update-mariadb-to-10.2-a70764ae400aadf6.yaml b/releasenotes/notes/update-mariadb-to-10.2-a70764ae400aadf6.yaml new file mode 100644 index 00000000..7991c447 --- /dev/null +++ b/releasenotes/notes/update-mariadb-to-10.2-a70764ae400aadf6.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The MariaDB version has been bumped to 10.2 diff --git a/tasks/galera_install_zypper.yml b/tasks/galera_install_zypper.yml index 9a90c750..639bc24a 100644 --- a/tasks/galera_install_zypper.yml +++ b/tasks/galera_install_zypper.yml @@ -63,6 +63,19 @@ retries: 5 delay: 2 +- name: Install percona repo + zypper_repository: + name: "{{ galera_percona_xtrabackup_repo.name }}" + description: "{{ galera_percona_xtrabackup_repo.description }}" + repo: "{{ galera_percona_xtrabackup_repo.repo }}" + autorefresh: yes + auto_import_keys: yes + state: "{{ galera_percona_xtrabackup_repo.state }}" + register: add_repos + until: add_repos is success + retries: 5 + delay: 2 + - name: Install galera_server role remote packages (zypper) zypper: name: "{{ galera_packages_list }}" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 45adfb13..a4cfc2c1 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -61,7 +61,6 @@ galera_server_upgrade_packages_remove: galera_mariadb_service_name: "mariadb" -# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved. _galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/centos7-amd64" _galera_repo: name: MariaDB @@ -74,7 +73,7 @@ _galera_percona_xtrabackup_repo: galera_server_percona_distro_packages: - percona-toolkit - - percona-xtrabackup + - percona-xtrabackup-24 - "{{ (galera_xtrabackup_compression | bool) | ternary('qpress', '') }}" galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index faf9ec36..50425040 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -60,13 +60,20 @@ galera_server_upgrade_packages_remove: galera_mariadb_service_name: "mariadb" -# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved. _galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/opensuse42-amd64" _galera_repo: name: MariaDB description: "MariaDB Repo" baseurl: "{{ galera_repo_url }}" +# NOTE(hwoarang): Extra repository is only needed for 42.3. If this starts failig due to network issues we should +# simply pin 10.1.31 to Leap 42.3 +_galera_percona_xtrabackup_repo: + name: "OBS:home:markoschandras:osa" + description: "OBS OpenStack Ansible repository" + repo: "https://download.opensuse.org/repositories/home:/markoschandras:/osa/openSUSE_Leap_{{ ansible_distribution_version }}" + state: "{{ (ansible_distribution_major_version == '42') | ternary('present', 'absent') }}" + galera_server_percona_distro_packages: - percona-toolkit - percona-xtrabackup diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 2538a33d..86f08775 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -58,7 +58,7 @@ _galera_mariadb_server_package: "mariadb-server-{{ galera_major_version }}" # the preseed task and the service startup control used when installing # mariadb-galera-server and galera. galera_server_mariadb_distro_packages: - - libmariadbclient-dev + - libmariadb-dev - mariadb-client - "{{ galera_mariadb_server_package }}" - galera-3 @@ -84,7 +84,7 @@ galera_debconf_items: galera_server_percona_distro_packages: - percona-toolkit - - percona-xtrabackup + - percona-xtrabackup-24 - "{{ (galera_xtrabackup_compression | bool) | ternary('qpress', '') }}" # Repositories @@ -93,7 +93,6 @@ _galera_percona_xtrabackup_repo: state: "{{ (use_percona_upstream | bool) | ternary('present', 'absent') }}" filename: "Percona" -# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved. _galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/repo/ubuntu" _galera_repo: repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main"