From cdfac3eacad07bb125221f0c3949df86d56b23ad 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: I032103fdc1fa2bb8599db3f113fb4fc7203a5672
---
 tasks/searchlight_init_systemd.yml    |  2 +-
 tasks/searchlight_install.yml         | 12 ++++++------
 tasks/searchlight_install_apt.yml     |  2 +-
 tasks/searchlight_service_setup.yml   | 10 +++++-----
 tests/test-searchlight-functional.yml |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tasks/searchlight_init_systemd.yml b/tasks/searchlight_init_systemd.yml
index c195ba7..36b8968 100755
--- a/tasks/searchlight_init_systemd.yml
+++ b/tasks/searchlight_init_systemd.yml
@@ -49,6 +49,6 @@
 - name: Reload the systemd daemon
   systemd:
     daemon_reload: "yes"
-  when: systemd_init | changed
+  when: systemd_init  is changed
   notify:
     - Restart Searchlight services
diff --git a/tasks/searchlight_install.yml b/tasks/searchlight_install.yml
index 312339d..38822e1 100644
--- a/tasks/searchlight_install.yml
+++ b/tasks/searchlight_install.yml
@@ -46,7 +46,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
 
@@ -63,21 +63,21 @@
   file:
     path: "{{ searchlight_bin | dirname }}"
     state: absent
-  when: searchlight_get_venv | changed
+  when: searchlight_get_venv  is changed
 
 - name: Create searchlight venv dir
   file:
     path: "{{ searchlight_bin | dirname }}"
     state: directory
   register: searchlight_venv_dir
-  when: searchlight_get_venv | changed
+  when: searchlight_get_venv  is changed
 
 - name: Unarchive pre-built venv
   unarchive:
     src: "/var/cache/{{ searchlight_venv_download_url | basename }}"
     dest: "{{ searchlight_bin | dirname }}"
     copy: "no"
-  when: searchlight_get_venv | changed
+  when: searchlight_get_venv  is changed
   notify:
     - Restart Searchlight services
 
@@ -92,7 +92,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: searchlight_get_venv | failed or searchlight_get_venv | skipped
@@ -117,6 +117,6 @@
         --no-wheel
   when:
     - not searchlight_developer_mode | bool
-    - searchlight_get_venv | success
+    - searchlight_get_venv  is success
   tags:
     - skip_ansible_lint
diff --git a/tasks/searchlight_install_apt.yml b/tasks/searchlight_install_apt.yml
index fa1c726..62b14fe 100644
--- a/tasks/searchlight_install_apt.yml
+++ b/tasks/searchlight_install_apt.yml
@@ -32,7 +32,7 @@
     pkg: "{{ item }}"
     state: "{{ searchlight_package_state }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   with_items: "{{ searchlight_apt_packages }}"
diff --git a/tasks/searchlight_service_setup.yml b/tasks/searchlight_service_setup.yml
index 7970e4a..75d3d4f 100644
--- a/tasks/searchlight_service_setup.yml
+++ b/tasks/searchlight_service_setup.yml
@@ -26,7 +26,7 @@
     description: "{{ searchlight_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
@@ -45,7 +45,7 @@
     description: "{{ searchlight_service_project_description }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_project
-  until: add_project|success
+  until: add_project is success
   retries: 5
   delay: 10
   no_log: True
@@ -63,7 +63,7 @@
     password: "{{ searchlight_service_password }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_user
-  until: add_user|success
+  until: add_user is success
   retries: 5
   delay: 10
   no_log: True
@@ -81,7 +81,7 @@
     role_name: "{{ searchlight_role_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_admin_role
-  until: add_admin_role|success
+  until: add_admin_role is success
   retries: 5
   delay: 10
   no_log: True
@@ -106,7 +106,7 @@
       - url: "{{ searchlight_service_adminurl }}"
         interface: "admin"
   register: add_endpoint
-  until: add_endpoint|success
+  until: add_endpoint is success
   retries: 5
   delay: 10
   no_log: True
diff --git a/tests/test-searchlight-functional.yml b/tests/test-searchlight-functional.yml
index 01f4b15..cea9733 100755
--- a/tests/test-searchlight-functional.yml
+++ b/tests/test-searchlight-functional.yml
@@ -25,7 +25,7 @@
         name: "curl"
         state: "{{ searchlight_package_state }}"
       register: install_packages
-      until: install_packages | success
+      until: install_packages  is success
       retries: 5
       delay: 2
     - name: Check the searchlight-api