openstack
/
openstack-ansible-repo_server
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: Ib73373d8801c9eedd7c6e92b994a2fba0349ed90
This commit is contained in:
Jean-Philippe Evrard 2018-07-12 16:44:21 +02:00
parent 8a80b026fc
commit 6802793bb9
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
handlers/main.yml
View File

@ -20,7 +20,7 @@
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
@ -31,7 +31,7 @@
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
@ -42,7 +42,7 @@
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
@ -53,7 +53,7 @@
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
@ -64,7 +64,7 @@
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
@ -75,7 +75,7 @@
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
@ -86,7 +86,7 @@
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

2
tasks/repo_cacher.yml
View File

@ -18,7 +18,7 @@
name: "{{ repo_pkg_cache_server_distro_packages }}" name: "{{ repo_pkg_cache_server_distro_packages }}"
state: "{{ repo_server_package_state }}" state: "{{ repo_server_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages is success
retries: 5 retries: 5
delay: 5 delay: 5
when: when:

12
tasks/repo_install.yml
View File

@ -20,7 +20,7 @@
when: when:
- ansible_pkg_mgr in ['yum', 'dnf'] - ansible_pkg_mgr in ['yum', 'dnf']
register: _add_yum_keys register: _add_yum_keys
until: _add_yum_keys | success until: _add_yum_keys is success
retries: 5 retries: 5
delay: 2 delay: 2
@ -36,7 +36,7 @@
when: when:
- ansible_pkg_mgr in ['yum', 'dnf'] - ansible_pkg_mgr in ['yum', 'dnf']
register: install_epel_repo register: install_epel_repo
until: install_epel_repo|success until: install_epel_repo is success
retries: 5 retries: 5
delay: 2 delay: 2
@ -60,7 +60,7 @@
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" update_cache: "{{ (ansible_pkg_mgr == 'apt') | 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: 5 delay: 5
@ -91,7 +91,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
@ -112,7 +112,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
notify: notify:
@ -130,7 +130,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
notify: notify:

2
tests/test-repo-server-functional.yml
View File

@ -62,7 +62,7 @@
- name: Check apt-cacher-ng is running - name: Check apt-cacher-ng is running
command: "pgrep apt-cacher-ng" command: "pgrep apt-cacher-ng"
register: pgrep_apt_cacher_ng register: pgrep_apt_cacher_ng
until: pgrep_apt_cacher_ng | success until: pgrep_apt_cacher_ng is success
retries: 5 retries: 5
delay: 2 delay: 2
tags: tags: