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: I27326b56cfec69444dae0ca1c7abf0b78ad2299b
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:21 +02:00
parent 1279d8e0aa
commit 1b03c3debe
3 changed files with 14 additions and 14 deletions

View File

@ -38,6 +38,6 @@
state: "restarted" state: "restarted"
when: trove_use_mod_wsgi | bool when: trove_use_mod_wsgi | bool
register: apache_restart register: apache_restart
until: apache_restart|success until: apache_restart is success
retries: 5 retries: 5
delay: 2 delay: 2

View File

@ -23,7 +23,7 @@
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages is success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: "{{ trove_distro_packages }}" with_items: "{{ trove_distro_packages }}"
@ -47,7 +47,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }} {{ pip_install_options | default('') }}
register: install_packages register: install_packages
until: install_packages|success until: install_packages is success
retries: 5 retries: 5
delay: 2 delay: 2
@ -70,7 +70,7 @@
file: file:
path: "{{ trove_bin | dirname }}" path: "{{ trove_bin | dirname }}"
state: absent state: absent
when: trove_get_venv | changed when: trove_get_venv is changed
- name: Create trove venv dir - name: Create trove venv dir
file: file:
@ -78,14 +78,14 @@
state: directory state: directory
mode: "0755" mode: "0755"
register: trove_venv_dir register: trove_venv_dir
when: trove_get_venv | changed when: trove_get_venv is changed
- name: Unarchive pre-built venv - name: Unarchive pre-built venv
unarchive: unarchive:
src: "/var/cache/{{ trove_venv_download_url | basename }}" src: "/var/cache/{{ trove_venv_download_url | basename }}"
dest: "{{ trove_bin | dirname }}" dest: "{{ trove_bin | dirname }}"
copy: "no" copy: "no"
when: trove_get_venv | changed when: trove_get_venv is changed
notify: notify:
- Restart trove API services - Restart trove API services
- Restart trove conductor service - Restart trove conductor service
@ -103,7 +103,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }} {{ pip_install_options | default('') }}
register: install_packages register: install_packages
until: install_packages|success until: install_packages is success
retries: 5 retries: 5
delay: 2 delay: 2
when: trove_get_venv | failed or trove_get_venv | skipped when: trove_get_venv | failed or trove_get_venv | skipped
@ -119,7 +119,7 @@
state: "absent" state: "absent"
when: when:
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- trove_get_venv | changed - trove_get_venv is changed
# NOTE(odyssey4me): # NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right # We reinitialize the venv to ensure that the right
@ -137,7 +137,7 @@
--no-pip \ --no-pip \
--no-setuptools \ --no-setuptools \
--no-wheel --no-wheel
when: trove_get_venv | changed when: trove_get_venv is changed
tags: tags:
- skip_ansible_lint - skip_ansible_lint

View File

@ -28,7 +28,7 @@
project_name: "{{ trove_service_project_name }}" project_name: "{{ trove_service_project_name }}"
description: "{{ trove_service_description }}" description: "{{ trove_service_description }}"
register: add_trove_tenant register: add_trove_tenant
until: add_trove_tenant |success until: add_trove_tenant is success
retries: 5 retries: 5
delay: 2 delay: 2
no_log: True no_log: True
@ -49,7 +49,7 @@
service_type: "{{ trove_service_type }}" service_type: "{{ trove_service_type }}"
description: "{{ trove_service_description }}" description: "{{ trove_service_description }}"
register: add_trove_service register: add_trove_service
until: add_trove_service |success until: add_trove_service is success
retries: 5 retries: 5
delay: 2 delay: 2
no_log: True no_log: True
@ -71,7 +71,7 @@
password: "{{ trove_service_password }}" password: "{{ trove_service_password }}"
project_name: "{{ trove_service_project_name }}" project_name: "{{ trove_service_project_name }}"
register: add_trove_admin_user register: add_trove_admin_user
until: add_trove_admin_user |success until: add_trove_admin_user is success
retries: 5 retries: 5
delay: 2 delay: 2
no_log: True no_log: True
@ -94,7 +94,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}" insecure: "{{ keystone_service_adminuri_insecure }}"
project_name: "{{ trove_service_project_name }}" project_name: "{{ trove_service_project_name }}"
register: ensure_trove_admin_roles register: ensure_trove_admin_roles
until: ensure_trove_admin_roles |success until: ensure_trove_admin_roles is success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: "{{ trove_service_admin_role_names }}" with_items: "{{ trove_service_admin_role_names }}"
@ -119,7 +119,7 @@
- url: "{{ trove_service_adminurl }}" - url: "{{ trove_service_adminurl }}"
interface: "admin" interface: "admin"
register: add_trove_endpoints register: add_trove_endpoints
until: add_trove_endpoints |success until: add_trove_endpoints is success
retries: 5 retries: 5
delay: 2 delay: 2
no_log: True no_log: True