From 19802e10e039677dd7426a6a9c303a5899a5f8ed Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 2 Nov 2016 13:15:46 +0000 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: I45f923ffcb26efd85cdde73d096993e08132706a --- tasks/main.yml | 1 + tasks/rabbitmq_cluster_create.yml | 4 ++-- tasks/rabbitmq_cluster_join.yml | 7 ++++--- tasks/rabbitmq_post_install.yml | 2 ++ tasks/rabbitmq_set_cookie.yml | 2 +- tasks/rabbitmq_upgrade_prep.yml | 1 + 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index aee6ea4c..0868e26f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,6 +26,7 @@ - name: Check init system command: cat /proc/1/comm + changed_when: false register: _pid1_name tags: - always diff --git a/tasks/rabbitmq_cluster_create.yml b/tasks/rabbitmq_cluster_create.yml index 3b235c93..8ac6426d 100644 --- a/tasks/rabbitmq_cluster_create.yml +++ b/tasks/rabbitmq_cluster_create.yml @@ -23,8 +23,8 @@ - rabbitmq-cluster - name: Create rabbitmq cluster - shell: | - rabbitmqctl set_cluster_name {{ rabbitmq_cluster_name }} + command: rabbitmqctl set_cluster_name {{ rabbitmq_cluster_name }} + changed_when: false when: rabbitmq_cluster_status.rc != 0 tags: - rabbitmq-cluster diff --git a/tasks/rabbitmq_cluster_join.yml b/tasks/rabbitmq_cluster_join.yml index 1689e5b2..61fd0de2 100644 --- a/tasks/rabbitmq_cluster_join.yml +++ b/tasks/rabbitmq_cluster_join.yml @@ -35,8 +35,9 @@ - rabbitmq-cluster - name: Join rabbitmq cluster - shell: | + command: > rabbitmqctl join_cluster "rabbit@{{ rabbitmq_primary_cluster_node.split('.')[0] }}" + changed_when: false when: result.rc != 0 register: rabbit_join_cluster until: rabbit_join_cluster|success @@ -46,8 +47,8 @@ - rabbitmq-cluster - name: Start rabbitmq app - shell: | - rabbitmqctl start_app + command: rabbitmqctl start_app + changed_when: false when: result.rc != 0 tags: - rabbitmq-start-app diff --git a/tasks/rabbitmq_post_install.yml b/tasks/rabbitmq_post_install.yml index 6c794677..4a482f1f 100644 --- a/tasks/rabbitmq_post_install.yml +++ b/tasks/rabbitmq_post_install.yml @@ -76,6 +76,8 @@ - rabbit_resource_limit_changed|changed tags: - rabbitmq-config + # don't trigger ANSIBLE0016 + - skip_ansible_lint - include: rabbitmq_restart.yml static: no diff --git a/tasks/rabbitmq_set_cookie.yml b/tasks/rabbitmq_set_cookie.yml index 52398e43..91fc7948 100644 --- a/tasks/rabbitmq_set_cookie.yml +++ b/tasks/rabbitmq_set_cookie.yml @@ -14,7 +14,7 @@ # limitations under the License. - name: Read rabbit cookie - shell: "cat /var/lib/rabbitmq/.erlang.cookie" + command: "cat /var/lib/rabbitmq/.erlang.cookie" register: tmp_rabbit_cookie changed_when: tmp_rabbit_cookie.rc != 0 failed_when: false diff --git a/tasks/rabbitmq_upgrade_prep.yml b/tasks/rabbitmq_upgrade_prep.yml index b6914a7d..e77e1609 100644 --- a/tasks/rabbitmq_upgrade_prep.yml +++ b/tasks/rabbitmq_upgrade_prep.yml @@ -28,6 +28,7 @@ - name: Ensure erlang epmd is stopped shell: | pkill $(pgrep -lf "erlang" | awk '{print $2}') + changed_when: false failed_when: false tags: - rabbitmq-upgrade