Merge "Fix usage of "|" for tests"

This commit is contained in:
Zuul 2018-07-14 13:29:20 +00:00 committed by Gerrit Code Review
commit 2347e727b6
3 changed files with 14 additions and 14 deletions

View File

@ -29,6 +29,6 @@
state: "restarted"
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
register: _restart
until: _restart | success
until: _restart is success
retries: 5
delay: 2

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
with_items: "{{ panko_distro_packages }}"
@ -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
with_items: "{{ panko_test_distro_packages }}"
@ -56,7 +56,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
@ -79,7 +79,7 @@
file:
path: "{{ panko_bin | dirname }}"
state: absent
when: panko_get_venv | changed
when: panko_get_venv is changed
- name: Create panko venv dir
file:
@ -87,14 +87,14 @@
state: directory
mode: "0755"
register: panko_venv_dir
when: panko_get_venv | changed
when: panko_get_venv is changed
- name: Unarchive pre-built venv
unarchive:
src: "/var/cache/{{ panko_venv_download_url | basename }}"
dest: "{{ panko_bin | dirname }}"
copy: "no"
when: panko_get_venv | changed
when: panko_get_venv is changed
- name: Install pip packages
pip:
@ -107,7 +107,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: panko_get_venv | failed or panko_get_venv | skipped
@ -118,7 +118,7 @@
state: "absent"
when:
- ansible_pkg_mgr in ['yum', 'dnf']
- panko_get_venv | changed
- panko_get_venv is changed
# NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right
@ -136,7 +136,7 @@
--no-pip \
--no-setuptools \
--no-wheel
when: panko_get_venv | changed
when: panko_get_venv is changed
tags:
- skip_ansible_lint

View File

@ -25,7 +25,7 @@
description: "{{ panko_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
@ -44,7 +44,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not panko_service_in_ldap | bool
until: add_service|success
until: add_service is success
retries: 5
delay: 10
no_log: True
@ -62,7 +62,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_admin_role
when: not panko_service_in_ldap | bool
until: add_admin_role|success
until: add_admin_role is success
retries: 5
delay: 10
no_log: True
@ -87,7 +87,7 @@
- url: "{{ panko_service_internalurl }}"
interface: "internal"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
no_log: True