openstack
/
openstack-ansible-os_zaqar
Code Issues Proposed changes

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: I7a5b4cf134a73e9dc6eda08c935696c5b8b8a034
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:21 +02:00
parent 62dfbc77bd
commit d25f899c43
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/main.yml
View File

@ -25,7 +25,7 @@
state: "restarted" state: "restarted"
pattern: "apache2" pattern: "apache2"
register: apache_restart register: apache_restart
until: apache_restart|success until: apache_restart is success
retries: 5 retries: 5
delay: 2 delay: 2
@ -35,6 +35,6 @@
state: "restarted" state: "restarted"
pattern: "nginx" pattern: "nginx"
register: nginx_restart register: nginx_restart
until: nginx_restart|success until: nginx_restart is success
retries: 5 retries: 5
delay: 2 delay: 2

2
tasks/install-apt.yml
View File

@ -20,7 +20,7 @@
update_cache: yes update_cache: yes
cache_valid_time: "{{ cache_timeout }}" cache_valid_time: "{{ cache_timeout }}"
register: install_apt_packages register: install_apt_packages
until: install_apt_packages | success until: install_apt_packages is success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: "{{ zaqar_distro_packages }}" with_items: "{{ zaqar_distro_packages }}"

10
tasks/zaqar_install.yml
View File

@ -68,7 +68,7 @@
file: file:
path: "{{ zaqar_bin | dirname }}" path: "{{ zaqar_bin | dirname }}"
state: absent state: absent
when: zaqar_get_venv | changed when: zaqar_get_venv is changed
tags: tags:
- zaqar-install - zaqar-install
- zaqar-pip-packages - zaqar-pip-packages
@ -78,7 +78,7 @@
path: "{{ zaqar_bin | dirname }}" path: "{{ zaqar_bin | dirname }}"
state: directory state: directory
register: zaqar_venv_dir register: zaqar_venv_dir
when: zaqar_get_venv | changed when: zaqar_get_venv is changed
tags: tags:
- zaqar-install - zaqar-install
- zaqar-pip-packages - zaqar-pip-packages
@ -88,7 +88,7 @@
src: "/var/cache/{{ zaqar_venv_download_url | basename }}" src: "/var/cache/{{ zaqar_venv_download_url | basename }}"
dest: "{{ zaqar_bin | dirname }}" dest: "{{ zaqar_bin | dirname }}"
copy: "no" copy: "no"
when: zaqar_get_venv | changed when: zaqar_get_venv is changed
# notify: # notify:
# - Restart zaqar api # - Restart zaqar api
tags: tags:
@ -106,7 +106,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: zaqar_get_venv | failed or zaqar_get_venv | skipped when: zaqar_get_venv | failed or zaqar_get_venv | skipped
@ -132,7 +132,7 @@
--no-pip \ --no-pip \
--no-setuptools \ --no-setuptools \
--no-wheel --no-wheel
when: zaqar_get_venv | changed when: zaqar_get_venv is changed
tags: tags:
- skip_ansible_lint - skip_ansible_lint
- zaqar-install - zaqar-install