From b4148466e47e8bb511eeb4786ef088fa36cec271 Mon Sep 17 00:00:00 2001 From: Logan V Date: Tue, 1 Nov 2016 21:18:09 +0000 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: Ib0c8a23dd03fb1daf4259a3333cf7c6e0a058721 --- tasks/galera_bootstrap.yml | 5 +++-- tasks/galera_cluster_state.yml | 3 ++- tasks/galera_upgrade_post.yml | 2 ++ tasks/galera_upgrade_pre.yml | 3 ++- tasks/main.yml | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tasks/galera_bootstrap.yml b/tasks/galera_bootstrap.yml index ab771fe4..502d9475 100644 --- a/tasks/galera_bootstrap.yml +++ b/tasks/galera_bootstrap.yml @@ -31,7 +31,7 @@ - galera-bootstrap - name: Start cluster with wsrep init - shell: "/etc/init.d/mysql bootstrap" + command: "/etc/init.d/mysql bootstrap" when: - inventory_hostname == galera_server_bootstrap_node - mysql_running.rc != 0 @@ -53,7 +53,8 @@ - galera-operational - galera-bootstrap -- set_fact: +- name: Set the galera running and bootstrapped fact + set_fact: galera_running_and_bootstrapped: true when: - inventory_hostname == galera_server_bootstrap_node diff --git a/tasks/galera_cluster_state.yml b/tasks/galera_cluster_state.yml index 7f1bdf40..ed4ae6b2 100644 --- a/tasks/galera_cluster_state.yml +++ b/tasks/galera_cluster_state.yml @@ -80,7 +80,8 @@ tags: - galera-cluster-state-check -- set_fact: +- name: Set the galera existing cluster fact + set_fact: galera_existing_cluster: true when: mysql_running.rc == 0 tags: diff --git a/tasks/galera_upgrade_post.yml b/tasks/galera_upgrade_post.yml index 97b23b43..e2de350f 100644 --- a/tasks/galera_upgrade_post.yml +++ b/tasks/galera_upgrade_post.yml @@ -28,6 +28,7 @@ done echo "Service failed to start" exit 1 + changed_when: false tags: - galera-upgrade @@ -38,6 +39,7 @@ - name: Run MySQL Upgrade command: "/usr/bin/mysql_upgrade" + changed_when: false register: galera_mysql_upgrade until: galera_mysql_upgrade | success retries: 3 diff --git a/tasks/galera_upgrade_pre.yml b/tasks/galera_upgrade_pre.yml index d7bc7d7d..bb75719b 100644 --- a/tasks/galera_upgrade_pre.yml +++ b/tasks/galera_upgrade_pre.yml @@ -31,8 +31,9 @@ - galera-upgrade - name: Find old sources - shell: | + command: > grep -rnil maria /etc/apt/sources.list.d/* + changed_when: false register: old_sources tags: - galera-upgrade diff --git a/tasks/main.yml b/tasks/main.yml index cfb15dc6..2743f963 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -- fail: +- name: Fail when the host is not in galera_cluster_members + fail: msg: "The host {{ inventory_hostname }} must be in galera_cluster_members." when: inventory_hostname not in galera_cluster_members @@ -37,6 +38,7 @@ - name: Check init system command: cat /proc/1/comm + changed_when: false register: _pid1_name tags: - always