From 09becff72605c12b4a11b87e50608fa1c7bd386b 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: I1cfe38a48845940fad3907642c97c8242388797d
---
 tasks/heat_domain_setup.yml   |  4 ++--
 tasks/heat_install.yml        |  2 +-
 tasks/heat_install_source.yml | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tasks/heat_domain_setup.yml b/tasks/heat_domain_setup.yml
index 8bd0ca9..fa09eeb 100644
--- a/tasks/heat_domain_setup.yml
+++ b/tasks/heat_domain_setup.yml
@@ -60,7 +60,7 @@
     password: "{{ heat_stack_domain_admin_password }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -77,7 +77,7 @@
     domain_name: "{{ heat_stack_user_domain_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
diff --git a/tasks/heat_install.yml b/tasks/heat_install.yml
index 23c68e5..cac2cd8 100644
--- a/tasks/heat_install.yml
+++ b/tasks/heat_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
 
diff --git a/tasks/heat_install_source.yml b/tasks/heat_install_source.yml
index ad7a9cf..101d441 100644
--- a/tasks/heat_install_source.yml
+++ b/tasks/heat_install_source.yml
@@ -41,7 +41,7 @@
   file:
     path: "{{ heat_bin | dirname }}"
     state: absent
-  when: heat_get_venv | changed
+  when: heat_get_venv  is changed
 
 - name: Create heat venv dir
   file:
@@ -49,14 +49,14 @@
     state: directory
     mode: "0755"
   register: heat_venv_dir
-  when: heat_get_venv | changed
+  when: heat_get_venv  is changed
 
 - name: Unarchive pre-built venv
   unarchive:
     src: "/var/cache/{{ heat_venv_download_url | basename }}"
     dest: "{{ heat_bin | dirname }}"
     copy: "no"
-  when: heat_get_venv | changed
+  when: heat_get_venv  is changed
   notify: Restart heat services
 
 - name: Install pip packages
@@ -70,7 +70,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: heat_get_venv | failed or heat_get_venv | skipped
@@ -82,7 +82,7 @@
     state: "absent"
   when:
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
-    - heat_get_venv | changed
+    - heat_get_venv  is changed
 
 # NOTE(odyssey4me):
 # We reinitialize the venv to ensure that the right
@@ -100,7 +100,7 @@
         --no-pip \
         --no-setuptools \
         --no-wheel
-  when: heat_get_venv | changed
+  when: heat_get_venv  is changed
   tags:
     - skip_ansible_lint