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

View File

@@ -20,7 +20,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
@@ -42,7 +42,7 @@
{{ pip_install_options | default('') }}
when: tempest_requires_pip_packages | length > 0
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
@@ -65,7 +65,7 @@
file:
path: "{{ tempest_venv_bin | dirname }}"
state: absent
when: tempest_get_venv | changed
when: tempest_get_venv is changed
- name: Create tempest venv dir
file:
@@ -73,14 +73,14 @@
state: directory
mode: "0755"
register: tempest_venv_dir
when: tempest_get_venv | changed
when: tempest_get_venv is changed
- name: Unarchive pre-built venv
unarchive:
src: "/var/cache/{{ tempest_venv_download_url | basename }}"
dest: "{{ tempest_venv_bin | dirname }}"
copy: "no"
when: tempest_get_venv | changed
when: tempest_get_venv is changed
- name: Install pip packages
pip:
@@ -93,7 +93,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: tempest_get_venv | failed or tempest_get_venv | skipped
@@ -104,7 +104,7 @@
state: "absent"
when:
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- tempest_get_venv | changed
- tempest_get_venv is changed
# NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right
@@ -122,7 +122,7 @@
--no-pip \
--no-setuptools \
--no-wheel
when: tempest_get_venv | changed
when: tempest_get_venv is changed
tags:
- skip_ansible_lint
@@ -135,7 +135,7 @@
with_items: "{{ tempest_plugins }}"
when: item.repo is defined
register: git_clone
until: git_clone|success
until: git_clone is success
retries: 5
delay: 2
@@ -163,7 +163,7 @@
- "item.stat.exists"
- "(item.item.install_test_requirements | default(True)) | bool"
register: install_tempest_plugin_requirements
until: install_tempest_plugin_requirements | success
until: install_tempest_plugin_requirements is success
retries: 5
delay: 2
@@ -181,7 +181,7 @@
with_items: "{{ tempest_plugins }}"
when: item.repo is defined
register: install_tempest_plugins
until: install_tempest_plugins | success
until: install_tempest_plugins is success
retries: 5
delay: 2
@@ -199,7 +199,7 @@
with_items: "{{ tempest_plugins }}"
when: item.package is defined
register: install_tempest_plugins_packages
until: install_tempest_plugins_packages | success
until: install_tempest_plugins_packages is success
retries: 5
delay: 2

View File

@@ -23,7 +23,7 @@
login_project_name: "{{ keystone_admin_tenant_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 6
delay: 5
no_log: True

View File

@@ -37,7 +37,7 @@
with_items: "{{ tempest_images }}"
when: tempest_service_available_glance | bool
register: fetch_url
until: fetch_url | success
until: fetch_url is success
retries: 6
delay: 5
delegate_to: "{{ (tempest_image_downloader == 'deployment-host') | ternary('localhost', inventory_hostname) }}"
@@ -51,7 +51,7 @@
- tempest_service_available_glance | bool
- tempest_image_downloader == "deployment-host"
register: fetch_url
until: fetch_url | success
until: fetch_url is success
retries: 6
delay: 5
@@ -67,7 +67,7 @@
is_public: True
with_items: "{{ tempest_images }}"
register: tempest_image_create
until: tempest_image_create | success
until: tempest_image_create is success
retries: 5
delay: 15
when: tempest_service_available_glance | bool
@@ -90,7 +90,7 @@
login_project_name: "{{ keystone_admin_tenant_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
with_items:
@@ -111,7 +111,7 @@
login_project_name: "{{ keystone_admin_tenant_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
with_items:
@@ -126,7 +126,7 @@
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
name: "{{ item }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
with_items: "{{ tempest_roles }}"
@@ -143,7 +143,7 @@
login_project_name: "{{ keystone_admin_tenant_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
when: tempest_service_available_heat | bool
@@ -162,7 +162,7 @@
login_project_name: "{{ keystone_admin_tenant_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