From fd498ad45679bbdc1178fe18adb61ba81bf40db2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 12 Jul 2018 16:44:21 +0200 Subject: [PATCH] Fix usage of "|" for tests With the more recent versions of ansible, we should now use "is" instead of the "|" sign for the tests. This should fix it. Change-Id: I70c853d9aba11eb91ab25f7a29417d0ec50fdf3d --- tasks/install_apt.yml | 10 +++++----- tasks/install_yum.yml | 4 ++-- tasks/install_zypper.yml | 6 +++--- tasks/rabbitmq_cluster_join.yml | 4 ++-- tasks/rabbitmq_install.yml | 2 +- tasks/rabbitmq_post_install.yml | 6 +++--- tasks/rabbitmq_pre_install.yml | 2 +- tasks/rabbitmq_set_cookie.yml | 4 ++-- tasks/rabbitmq_upgrade_check.yml | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml index 21687a79..f720f1e4 100644 --- a/tasks/install_apt.yml +++ b/tasks/install_apt.yml @@ -36,7 +36,7 @@ url: "{{ item.url | default(omit) }}" state: "present" register: add_keys - until: add_keys | success + until: add_keys is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" @@ -51,7 +51,7 @@ url: "{{ item.fallback_url | default(omit) }}" state: "present" register: add_keys_fallback - until: add_keys_fallback | success + until: add_keys_fallback is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" @@ -108,7 +108,7 @@ - (add_rabbitmq_repos is mapping and add_rabbitmq_repos | changed) or (add_erlang_repos is mapping and add_erlang_repos | changed) register: update_apt_cache - until: update_apt_cache | success + until: update_apt_cache is success retries: 5 delay: 2 tags: @@ -121,7 +121,7 @@ update_cache: yes cache_valid_time: "{{ cache_timeout }}" register: install_packages - until: install_packages | success + until: install_packages is success retries: 5 delay: 2 tags: @@ -142,7 +142,7 @@ name: "{{ rabbitmq_distro_packages }}" state: "{{ rabbitmq_package_state }}" register: install_packages - until: install_packages|success + until: install_packages is success retries: 5 delay: 2 when: diff --git a/tasks/install_yum.yml b/tasks/install_yum.yml index d346e0a5..df560075 100644 --- a/tasks/install_yum.yml +++ b/tasks/install_yum.yml @@ -19,7 +19,7 @@ state: present key: "{{ item.keyserver }}/{{ item.key_name }}" register: add_keys - until: add_keys | success + until: add_keys is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" @@ -32,7 +32,7 @@ state: present key: "{{ item.fallback_keyserver }}/{{ item.key_name }}" register: add_keys_fallback - until: add_keys_fallback | success + until: add_keys_fallback is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" diff --git a/tasks/install_zypper.yml b/tasks/install_zypper.yml index 9900260e..81869668 100644 --- a/tasks/install_zypper.yml +++ b/tasks/install_zypper.yml @@ -24,7 +24,7 @@ state: present key: "{{ item.keyserver }}/{{ item.key_name }}" register: add_keys - until: add_keys | success + until: add_keys is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" @@ -37,7 +37,7 @@ state: present key: "{{ item.fallback_keyserver }}/{{ item.key_name }}" register: add_keys_fallback - until: add_keys_fallback | success + until: add_keys_fallback is success retries: 5 delay: 2 with_items: "{{ rabbitmq_gpg_keys }}" @@ -98,6 +98,6 @@ systemd: daemon_reload: yes when: - - rabbitmq_server_service_added | changed + - rabbitmq_server_service_added is changed tags: - rabbitmq-config diff --git a/tasks/rabbitmq_cluster_join.yml b/tasks/rabbitmq_cluster_join.yml index 4c0caaa4..907e553b 100644 --- a/tasks/rabbitmq_cluster_join.yml +++ b/tasks/rabbitmq_cluster_join.yml @@ -30,7 +30,7 @@ command: > rabbitmqctl join_cluster "rabbit@{{ rabbitmq_primary_cluster_node.split('.')[0] }}" register: rabbit_join_cluster - until: rabbit_join_cluster|success + until: rabbit_join_cluster is success retries: 5 delay: 2 tags: @@ -43,7 +43,7 @@ - name: Start rabbitmq app command: rabbitmqctl start_app register: rabbit_start_app - until: rabbit_start_app|success + until: rabbit_start_app is success retries: 5 delay: 2 tags: diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml index 5a9a4230..341bc682 100644 --- a/tasks/rabbitmq_install.yml +++ b/tasks/rabbitmq_install.yml @@ -25,7 +25,7 @@ systemd: daemon_reload: yes when: - - install_rabbitmq | changed + - install_rabbitmq is changed tags: - rabbitmq-apt-packages - rabbitmq-yum-packages diff --git a/tasks/rabbitmq_post_install.yml b/tasks/rabbitmq_post_install.yml index b69bc501..5588016e 100644 --- a/tasks/rabbitmq_post_install.yml +++ b/tasks/rabbitmq_post_install.yml @@ -55,8 +55,8 @@ systemd: daemon_reload: yes when: - - rabbit_resource_limit | changed - - rabbit_restart_on_failure | changed + - rabbit_resource_limit is changed + - rabbit_restart_on_failure is changed tags: - rabbitmq-config # don't trigger ANSIBLE0016 @@ -86,7 +86,7 @@ - include: rabbitmq_restart.yml static: no - when: rabbit_config|changed or rabbitmq_plugin|changed or rabbitmq_policy|changed + when: rabbit_config is changed or rabbitmq_plugin is changed or rabbitmq_policy is changed # This is being done because the rabbitctl command used by the module # is not very effective at returning proper status codes for failure diff --git a/tasks/rabbitmq_pre_install.yml b/tasks/rabbitmq_pre_install.yml index 00a0e1be..22bb49ef 100644 --- a/tasks/rabbitmq_pre_install.yml +++ b/tasks/rabbitmq_pre_install.yml @@ -22,7 +22,7 @@ register: package_download retries: 3 delay: 10 - until: package_download|success + until: package_download is success when: rabbitmq_install_method == 'file' tags: - rabbitmq-package-deb diff --git a/tasks/rabbitmq_set_cookie.yml b/tasks/rabbitmq_set_cookie.yml index 4145fc71..b0d2d162 100644 --- a/tasks/rabbitmq_set_cookie.yml +++ b/tasks/rabbitmq_set_cookie.yml @@ -25,10 +25,10 @@ - include: rabbitmq_stopped.yml static: no when: - - cookie_set | changed + - cookie_set is changed - include: rabbitmq_started.yml static: no when: - - cookie_set | changed + - cookie_set is changed diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml index 7e72a738..8d38507f 100644 --- a/tasks/rabbitmq_upgrade_check.yml +++ b/tasks/rabbitmq_upgrade_check.yml @@ -50,8 +50,8 @@ set_fact: installed_rabbitmq: "{{ item }}" when: - - not item | skipped - - item | changed + - not item is skipped + - item is changed with_items: - "{{ installed_rabbitmq_deb }}" - "{{ installed_rabbitmq_rpm }}"