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: I2d4fe0c03a5b273f3979e1b7cbacaa97d8972c5a
This commit is contained in:
parent
29ab2c4ef6
commit
3d332b1cc4
@ -21,7 +21,7 @@
|
|||||||
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
||||||
with_items: "{{ filtered_aodh_services }}"
|
with_items: "{{ filtered_aodh_services }}"
|
||||||
register: _stop
|
register: _stop
|
||||||
until: _stop | success
|
until: _stop is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
listen: Restart aodh services
|
listen: Restart aodh services
|
||||||
@ -52,7 +52,7 @@
|
|||||||
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
||||||
with_items: "{{ filtered_aodh_services }}"
|
with_items: "{{ filtered_aodh_services }}"
|
||||||
register: _start
|
register: _start
|
||||||
until: _start | success
|
until: _start is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
listen: Restart aodh services
|
listen: Restart aodh services
|
||||||
@ -64,6 +64,6 @@
|
|||||||
state: "restarted"
|
state: "restarted"
|
||||||
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
||||||
register: _restart
|
register: _restart
|
||||||
until: _restart | success
|
until: _restart is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
|
@ -32,7 +32,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
|
||||||
|
|
||||||
@ -43,7 +43,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
|
||||||
when: install_test_packages|bool
|
when: install_test_packages|bool
|
||||||
|
@ -31,7 +31,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
|
||||||
|
|
||||||
@ -54,7 +54,7 @@
|
|||||||
file:
|
file:
|
||||||
path: "{{ aodh_bin | dirname }}"
|
path: "{{ aodh_bin | dirname }}"
|
||||||
state: absent
|
state: absent
|
||||||
when: aodh_get_venv | changed
|
when: aodh_get_venv is changed
|
||||||
|
|
||||||
- name: Create aodh venv dir
|
- name: Create aodh venv dir
|
||||||
file:
|
file:
|
||||||
@ -62,14 +62,14 @@
|
|||||||
state: directory
|
state: directory
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
register: aodh_venv_dir
|
register: aodh_venv_dir
|
||||||
when: aodh_get_venv | changed
|
when: aodh_get_venv is changed
|
||||||
|
|
||||||
- name: Unarchive pre-built venv
|
- name: Unarchive pre-built venv
|
||||||
unarchive:
|
unarchive:
|
||||||
src: "/var/cache/{{ aodh_venv_download_url | basename }}"
|
src: "/var/cache/{{ aodh_venv_download_url | basename }}"
|
||||||
dest: "{{ aodh_bin | dirname }}"
|
dest: "{{ aodh_bin | dirname }}"
|
||||||
copy: "no"
|
copy: "no"
|
||||||
when: aodh_get_venv | changed
|
when: aodh_get_venv is changed
|
||||||
notify: Restart aodh services
|
notify: Restart aodh services
|
||||||
|
|
||||||
- name: Install pip packages
|
- name: Install pip packages
|
||||||
@ -83,7 +83,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: aodh_get_venv | failed or aodh_get_venv | skipped
|
when: aodh_get_venv | failed or aodh_get_venv | skipped
|
||||||
@ -95,7 +95,7 @@
|
|||||||
state: "absent"
|
state: "absent"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
||||||
- aodh_get_venv | changed
|
- aodh_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
|
||||||
@ -113,7 +113,7 @@
|
|||||||
--no-pip \
|
--no-pip \
|
||||||
--no-setuptools \
|
--no-setuptools \
|
||||||
--no-wheel
|
--no-wheel
|
||||||
when: aodh_get_venv | changed
|
when: aodh_get_venv is changed
|
||||||
tags:
|
tags:
|
||||||
- skip_ansible_lint
|
- skip_ansible_lint
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
description: "{{ aodh_service_description }}"
|
description: "{{ aodh_service_description }}"
|
||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_service
|
register: add_service
|
||||||
until: add_service|success
|
until: add_service is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -44,7 +44,7 @@
|
|||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_service
|
register: add_service
|
||||||
when: not aodh_service_in_ldap | bool
|
when: not aodh_service_in_ldap | bool
|
||||||
until: add_service|success
|
until: add_service is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -62,7 +62,7 @@
|
|||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_admin_role
|
register: add_admin_role
|
||||||
when: not aodh_service_in_ldap | bool
|
when: not aodh_service_in_ldap | bool
|
||||||
until: add_admin_role|success
|
until: add_admin_role is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -87,7 +87,7 @@
|
|||||||
- url: "{{ aodh_service_internalurl }}"
|
- url: "{{ aodh_service_internalurl }}"
|
||||||
interface: "internal"
|
interface: "internal"
|
||||||
register: add_service
|
register: add_service
|
||||||
until: add_service|success
|
until: add_service is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
|
Loading…
Reference in New Issue
Block a user