From 10f6628036e47ceba2486b37c21564bd70259d9b Mon Sep 17 00:00:00 2001 From: TheGuyDanish <5776313+TheGuyDanish@users.noreply.github.com> Date: Tue, 1 Feb 2022 18:32:36 +0000 Subject: [PATCH] Ansible 2.12 compatibility Changed Python identification variable, fixes #15. Replaced deprecated terms in replication tasks. Removed hard-coded interpreter variable from tests. --- molecule/default/converge-mdbf.yml | 1 - molecule/default/converge.yml | 2 -- tasks/replication_replica.yml | 12 ++++++------ tasks/setup.yml | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/molecule/default/converge-mdbf.yml b/molecule/default/converge-mdbf.yml index ec003d5..9bccea3 100644 --- a/molecule/default/converge-mdbf.yml +++ b/molecule/default/converge-mdbf.yml @@ -3,7 +3,6 @@ hosts: all gather_facts: true vars: - ansible_python_interpreter: /usr/bin/python3 mariadb_use_official_repo: true mariadb_use_official_repo_url: https://archive.mariadb.org/mirror/repo mariadb_use_official_repo_version: 10.5 diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 25e1da4..f326fa5 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -2,8 +2,6 @@ - name: Converge hosts: all gather_facts: true - vars: - ansible_python_interpreter: /usr/bin/python3 vars_files: vars/testvars.yml roles: diff --git a/tasks/replication_replica.yml b/tasks/replication_replica.yml index c0eff58..509fb88 100644 --- a/tasks/replication_replica.yml +++ b/tasks/replication_replica.yml @@ -1,7 +1,7 @@ --- - name: Check replica replication status mysql_replication: - mode: getslave + mode: getreplica login_unix_socket: "{{ mariadb_unix_socket }}" register: replica no_log: true @@ -15,7 +15,7 @@ master_user='{{ item.name }}', master_password='{{ item.password }}', master_use_gtid=slave_pos" loop: "{{ mariadb_replication_user }}" when: - - not replica.Is_Slave + - not replica.Is_Replica no_log: true # # Following (not tested) should work on ansible 2.10 @@ -34,21 +34,21 @@ - name: Reset replica replication mysql_replication: - mode: resetslave + mode: resetreplica login_unix_socket: "{{ mariadb_unix_socket }}" when: - - not replica.Is_Slave + - not replica.Is_Replica - name: Check replica replication status (second time) mysql_replication: - mode: getslave + mode: getreplica login_unix_socket: "{{ mariadb_unix_socket }}" register: replica2 no_log: true - name: Start replica replication mysql_replication: - mode: startslave + mode: startreplica login_unix_socket: "{{ mariadb_unix_socket }}" when: - replica2.Slave_IO_Running == "No" diff --git a/tasks/setup.yml b/tasks/setup.yml index 51feba5..c48aa3b 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -30,7 +30,7 @@ - name: Determine required MariaDB Python libraries set_fact: - deb_mariadb_python_package: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-pymysql{% else %}python-pymysql{% endif %}" + deb_mariadb_python_package: "{% if 'python3' in discovered_interpreter_python|default('') %}python3-pymysql{% else %}python-pymysql{% endif %}" - name: Install python mariadb driver apt: