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
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:21 +02:00
parent 09165d6a19
commit 09becff726
3 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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

View File

@ -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