From 5a33e9da0ea991a7622c96adb2c35f6c4e6ee9f1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 4 May 2020 16:24:38 +0300 Subject: [PATCH] Use more reliable way to get mysql version mysqladmin --version displays version of client instead of server one. So we should make decision to run mysql upgrade or not based on the server version. Also this task should be ran only when mariadb is already deployed. This will make possible to be more independent from client version. Change-Id: Icd20b8c81337d37fba219aa6be482b391bdaedde --- tasks/galera_upgrade.yml | 4 ++-- tasks/main.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tasks/galera_upgrade.yml b/tasks/galera_upgrade.yml index 38e3419a..69222a6e 100644 --- a/tasks/galera_upgrade.yml +++ b/tasks/galera_upgrade.yml @@ -17,8 +17,8 @@ # version. If it is not assume it's nothing is installed. - name: Check mysql version shell: > - if which mysqladmin; then - mysqladmin --version | grep -w "{{ galera_major_version }}" + if which mysql; then + mysql -e "SHOW VARIABLES LIKE 'version';" --batch --skip-column-names | grep -w "{{ galera_major_version }}" fi register: mysqladmin_version changed_when: false diff --git a/tasks/main.yml b/tasks/main.yml index f4ec05ac..22a66e9c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -83,6 +83,7 @@ - always - include_tasks: galera_upgrade.yml + when: galera_deployed | bool tags: - galera_server-upgrade