openstack
/
openstack-ansible-os_gnocchi
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: I2f92ab5520fb2e9822fcd0bbc3382305066c5d21
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:21 +02:00
parent 523d590051
commit 2949cae220
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/main.yml
View File

@ -24,7 +24,7 @@
- "item.value.group in group_names" - "item.value.group in group_names"
- item.value.service_enabled | bool - item.value.service_enabled | bool
register: _stop register: _stop
until: _stop | success until: _stop is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: Restart gnocchi services listen: Restart gnocchi services
@ -58,7 +58,7 @@
- "item.value.group in group_names" - "item.value.group in group_names"
- item.value.service_enabled | bool - item.value.service_enabled | bool
register: _start register: _start
until: _start | success until: _start is success
retries: 5 retries: 5
delay: 2 delay: 2
listen: Restart gnocchi services listen: Restart gnocchi services
@ -71,6 +71,6 @@
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
when: gnocchi_use_mod_wsgi | bool when: gnocchi_use_mod_wsgi | bool
register: _restart register: _restart
until: _restart | success until: _restart is success
retries: 5 retries: 5
delay: 2 delay: 2

14
tasks/gnocchi_install.yml
View File

@ -20,7 +20,7 @@
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | 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
@ -52,7 +52,7 @@
file: file:
path: "{{ gnocchi_bin | dirname }}" path: "{{ gnocchi_bin | dirname }}"
state: absent state: absent
when: gnocchi_get_venv | changed when: gnocchi_get_venv is changed
- name: Create gnocchi venv dir - name: Create gnocchi venv dir
file: file:
@ -60,14 +60,14 @@
state: directory state: directory
mode: "0755" mode: "0755"
register: gnocchi_venv_dir register: gnocchi_venv_dir
when: gnocchi_get_venv | changed when: gnocchi_get_venv is changed
- name: Unarchive pre-built venv - name: Unarchive pre-built venv
unarchive: unarchive:
src: "/var/cache/{{ gnocchi_venv_download_url | basename }}" src: "/var/cache/{{ gnocchi_venv_download_url | basename }}"
dest: "{{ gnocchi_bin | dirname }}" dest: "{{ gnocchi_bin | dirname }}"
copy: "no" copy: "no"
when: gnocchi_get_venv | changed when: gnocchi_get_venv is changed
notify: notify:
- Restart gnocchi services - Restart gnocchi services
- Restart web server - Restart web server
@ -82,7 +82,7 @@
{{ gnocchi_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }} {{ gnocchi_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
{{ 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: gnocchi_get_venv | failed or gnocchi_get_venv | skipped when: gnocchi_get_venv | failed or gnocchi_get_venv | skipped
@ -96,7 +96,7 @@
state: "absent" state: "absent"
when: when:
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- gnocchi_get_venv | changed - gnocchi_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
@ -114,7 +114,7 @@
--no-pip \ --no-pip \
--no-setuptools \ --no-setuptools \
--no-wheel --no-wheel
when: gnocchi_get_venv | changed when: gnocchi_get_venv is changed
tags: tags:
- skip_ansible_lint - skip_ansible_lint