openstack/openstack-ansible-os_zun
Code Issues Proposed changes

Fix usage of "|" for tests

Browse Source 
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: Ifdbd067fe773b86bf065f618267d5132184efd22
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:20 +02:00
parent b139341740
commit 12c92738c4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers/main.yml
View File

@ -21,7 +21,7 @@
daemon_reload: yes daemon_reload: yes
with_items: "{{ filtered_zun_services }}" with_items: "{{ filtered_zun_services }}"
register: _stop register: _stop
until: _stop | success until: _stop is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: "Restart zun services" listen: "Restart zun services"
@ -34,7 +34,7 @@
daemon_reload: yes daemon_reload: yes
with_items: "{{ filtered_zun_services }}" with_items: "{{ filtered_zun_services }}"
register: _start register: _start
until: _start | success until: _start is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: "Restart zun services" listen: "Restart zun services"
@ -49,7 +49,7 @@
- docker - docker
- kuryr-libnetwork - kuryr-libnetwork
register: _stop register: _stop
until: _stop | success until: _stop is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: "Restart kuryr services" listen: "Restart kuryr services"
@ -64,7 +64,7 @@
- docker - docker
- kuryr-libnetwork - kuryr-libnetwork
register: _start register: _start
until: _start | success until: _start is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: "Restart kuryr services" listen: "Restart kuryr services"

12
tasks/zun_install.yml
View File

@ -56,7 +56,7 @@
path: "{{ zun_bin | dirname }}" path: "{{ zun_bin | dirname }}"
state: absent state: absent
when: when:
- zun_get_venv | changed - zun_get_venv is changed
- name: Create zun venv dir - name: Create zun venv dir
file: file:
@ -64,7 +64,7 @@
state: directory state: directory
register: zun_venv_dir register: zun_venv_dir
when: when:
- zun_get_venv | changed - zun_get_venv is changed
- name: Unarchive pre-built venv - name: Unarchive pre-built venv
unarchive: unarchive:
@ -72,7 +72,7 @@
dest: "{{ zun_bin | dirname }}" dest: "{{ zun_bin | dirname }}"
copy: "no" copy: "no"
when: when:
- zun_get_venv | changed - zun_get_venv is changed
notify: notify:
- Manage LB - Manage LB
- Restart zun services - Restart zun services
@ -88,7 +88,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: when:
@ -105,7 +105,7 @@
state: "absent" state: "absent"
when: when:
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- zun_get_venv | changed - zun_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
@ -124,7 +124,7 @@
--no-setuptools \ --no-setuptools \
--no-wheel --no-wheel
when: when:
- zun_get_venv | changed - zun_get_venv is changed
tags: tags:
- skip_ansible_lint - skip_ansible_lint