From 3d332b1cc45ea9897decbbb37fc34fc7aafb1b01 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
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: I2d4fe0c03a5b273f3979e1b7cbacaa97d8972c5a
---
 handlers/main.yml             |  6 +++---
 tasks/aodh_install.yml        |  4 ++--
 tasks/aodh_install_source.yml | 14 +++++++-------
 tasks/aodh_service_setup.yml  |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 31bc9bb..7237e37 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -21,7 +21,7 @@
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   with_items: "{{ filtered_aodh_services }}"
   register: _stop
-  until: _stop | success
+  until: _stop  is success
   retries: 5
   delay: 2
   listen: Restart aodh services
@@ -52,7 +52,7 @@
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   with_items: "{{ filtered_aodh_services }}"
   register: _start
-  until: _start | success
+  until: _start  is success
   retries: 5
   delay: 2
   listen: Restart aodh services
@@ -64,6 +64,6 @@
     state: "restarted"
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
diff --git a/tasks/aodh_install.yml b/tasks/aodh_install.yml
index baf9e72..adc18d8 100644
--- a/tasks/aodh_install.yml
+++ b/tasks/aodh_install.yml
@@ -32,7 +32,7 @@
     update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
 
@@ -43,7 +43,7 @@
     update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   when: install_test_packages|bool
diff --git a/tasks/aodh_install_source.yml b/tasks/aodh_install_source.yml
index 2a5de1e..4f595ad 100644
--- a/tasks/aodh_install_source.yml
+++ b/tasks/aodh_install_source.yml
@@ -31,7 +31,7 @@
       {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
       {{ pip_install_options | default('') }}
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
 
@@ -54,7 +54,7 @@
   file:
     path: "{{ aodh_bin | dirname }}"
     state: absent
-  when: aodh_get_venv | changed
+  when: aodh_get_venv  is changed
 
 - name: Create aodh venv dir
   file:
@@ -62,14 +62,14 @@
     state: directory
     mode: "0755"
   register: aodh_venv_dir
-  when: aodh_get_venv | changed
+  when: aodh_get_venv  is changed
 
 - name: Unarchive pre-built venv
   unarchive:
     src: "/var/cache/{{ aodh_venv_download_url | basename }}"
     dest: "{{ aodh_bin | dirname }}"
     copy: "no"
-  when: aodh_get_venv | changed
+  when: aodh_get_venv  is changed
   notify: Restart aodh services
 
 - name: Install pip packages
@@ -83,7 +83,7 @@
       {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
       {{ pip_install_options | default('') }}
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   when: aodh_get_venv | failed or aodh_get_venv | skipped
@@ -95,7 +95,7 @@
     state: "absent"
   when:
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
-    - aodh_get_venv | changed
+    - aodh_get_venv  is changed
 
 # NOTE(odyssey4me):
 # We reinitialize the venv to ensure that the right
@@ -113,7 +113,7 @@
         --no-pip \
         --no-setuptools \
         --no-wheel
-  when: aodh_get_venv | changed
+  when: aodh_get_venv  is changed
   tags:
     - skip_ansible_lint
 
diff --git a/tasks/aodh_service_setup.yml b/tasks/aodh_service_setup.yml
index 4cd3056..0a30aa4 100644
--- a/tasks/aodh_service_setup.yml
+++ b/tasks/aodh_service_setup.yml
@@ -25,7 +25,7 @@
     description: "{{ aodh_service_description }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 2
   no_log: True
@@ -44,7 +44,7 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
   when: not aodh_service_in_ldap | bool
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -62,7 +62,7 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_admin_role
   when: not aodh_service_in_ldap | bool
-  until: add_admin_role|success
+  until: add_admin_role is success
   retries: 5
   delay: 10
   no_log: True
@@ -87,7 +87,7 @@
       - url: "{{ aodh_service_internalurl }}"
         interface: "internal"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True