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: Ia1c412489554ab629a8ffa8e385a9b634f471861
This commit is contained in:
parent
d97fa0fd53
commit
92766000ed
@ -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
|
||||||
|
|
||||||
|
@ -32,7 +32,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
|
||||||
|
|
||||||
@ -55,7 +55,7 @@
|
|||||||
file:
|
file:
|
||||||
path: "{{ swift_bin | dirname }}"
|
path: "{{ swift_bin | dirname }}"
|
||||||
state: absent
|
state: absent
|
||||||
when: swift_get_venv | changed
|
when: swift_get_venv is changed
|
||||||
|
|
||||||
- name: Create swift venv dir
|
- name: Create swift venv dir
|
||||||
file:
|
file:
|
||||||
@ -63,14 +63,14 @@
|
|||||||
state: directory
|
state: directory
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
register: swift_venv_dir
|
register: swift_venv_dir
|
||||||
when: swift_get_venv | changed
|
when: swift_get_venv is changed
|
||||||
|
|
||||||
- name: Unarchive pre-built venv
|
- name: Unarchive pre-built venv
|
||||||
unarchive:
|
unarchive:
|
||||||
src: "/var/cache/{{ swift_venv_download_url | basename }}"
|
src: "/var/cache/{{ swift_venv_download_url | basename }}"
|
||||||
dest: "{{ swift_bin | dirname }}"
|
dest: "{{ swift_bin | dirname }}"
|
||||||
copy: "no"
|
copy: "no"
|
||||||
when: swift_get_venv | changed
|
when: swift_get_venv is changed
|
||||||
notify:
|
notify:
|
||||||
- Restart swift services
|
- Restart swift services
|
||||||
|
|
||||||
@ -85,7 +85,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: swift_get_venv | failed or swift_get_venv | skipped
|
when: swift_get_venv | failed or swift_get_venv | skipped
|
||||||
@ -98,7 +98,7 @@
|
|||||||
state: "absent"
|
state: "absent"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
||||||
- swift_get_venv | changed
|
- swift_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
|
||||||
@ -116,7 +116,7 @@
|
|||||||
--no-pip \
|
--no-pip \
|
||||||
--no-setuptools \
|
--no-setuptools \
|
||||||
--no-wheel
|
--no-wheel
|
||||||
when: swift_get_venv | changed
|
when: swift_get_venv is changed
|
||||||
tags:
|
tags:
|
||||||
- skip_ansible_lint
|
- skip_ansible_lint
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
login_project_name: "{{ keystone_admin_tenant_name }}"
|
login_project_name: "{{ keystone_admin_tenant_name }}"
|
||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: get_gnocchi_project
|
register: get_gnocchi_project
|
||||||
until: get_gnocchi_project|success
|
until: get_gnocchi_project is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
when:
|
when:
|
||||||
@ -35,7 +35,7 @@
|
|||||||
swift_gnocchi_service_project_id: "{{ keystone_facts.id }}"
|
swift_gnocchi_service_project_id: "{{ keystone_facts.id }}"
|
||||||
when:
|
when:
|
||||||
- swift_gnocchi_enabled | bool
|
- swift_gnocchi_enabled | bool
|
||||||
- get_gnocchi_project | success
|
- get_gnocchi_project is success
|
||||||
|
|
||||||
- name: swift proxy server configuration
|
- name: swift proxy server configuration
|
||||||
config_template:
|
config_template:
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
- "{{ swift_pypy_env }} /opt/get-pip.py"
|
- "{{ swift_pypy_env }} /opt/get-pip.py"
|
||||||
- "{{ swift_pypy_env | dirname }}/pip install --upgrade virtualenv"
|
- "{{ swift_pypy_env | dirname }}/pip install --upgrade virtualenv"
|
||||||
when:
|
when:
|
||||||
- local_pypy | changed
|
- local_pypy is changed
|
||||||
|
|
||||||
- name: Check for pypy venv
|
- name: Check for pypy venv
|
||||||
stat:
|
stat:
|
||||||
@ -65,7 +65,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:
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
description: "{{ swift_service_description }}"
|
description: "{{ swift_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
|
||||||
@ -45,7 +45,7 @@
|
|||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_service
|
register: add_service
|
||||||
when: not swift_service_in_ldap | bool
|
when: not swift_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
|
||||||
@ -64,7 +64,7 @@
|
|||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_service
|
register: add_service
|
||||||
when: not swift_service_in_ldap | bool
|
when: not swift_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
|
||||||
@ -79,7 +79,7 @@
|
|||||||
role_name: "{{ swift_operator_role }}"
|
role_name: "{{ swift_operator_role }}"
|
||||||
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: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -97,7 +97,7 @@
|
|||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_service
|
register: add_service
|
||||||
when: not swift_service_in_ldap | bool
|
when: not swift_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
|
||||||
@ -112,7 +112,7 @@
|
|||||||
role_name: "{{ swift_reselleradmin_role }}"
|
role_name: "{{ swift_reselleradmin_role }}"
|
||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: add_role
|
register: add_role
|
||||||
until: add_role|success
|
until: add_role is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -129,7 +129,7 @@
|
|||||||
role_name: "{{ swift_reselleradmin_role }}"
|
role_name: "{{ swift_reselleradmin_role }}"
|
||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
register: ensure_role
|
register: ensure_role
|
||||||
until: ensure_role|success
|
until: ensure_role is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
when: swift_ceilometer_enabled | bool
|
when: swift_ceilometer_enabled | bool
|
||||||
@ -147,7 +147,7 @@
|
|||||||
role_name: "{{ swift_operator_role }}"
|
role_name: "{{ swift_operator_role }}"
|
||||||
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: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -172,7 +172,7 @@
|
|||||||
- url: "{{ swift_service_adminurl }}"
|
- url: "{{ swift_service_adminurl }}"
|
||||||
interface: "admin"
|
interface: "admin"
|
||||||
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
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
when: groups['keystone_all'] is defined
|
when: groups['keystone_all'] is defined
|
||||||
register: add_service
|
register: add_service
|
||||||
run_once: true
|
run_once: true
|
||||||
until: add_service|success
|
until: add_service is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 10
|
delay: 10
|
||||||
no_log: True
|
no_log: True
|
||||||
@ -59,7 +59,7 @@
|
|||||||
when: groups['keystone_all'] is defined
|
when: groups['keystone_all'] is defined
|
||||||
run_once: true
|
run_once: true
|
||||||
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
|
||||||
@ -85,7 +85,7 @@
|
|||||||
when: groups['keystone_all'] is defined
|
when: groups['keystone_all'] is defined
|
||||||
run_once: true
|
run_once: true
|
||||||
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
|
||||||
@ -111,7 +111,7 @@
|
|||||||
when: groups['keystone_all'] is defined
|
when: groups['keystone_all'] is defined
|
||||||
run_once: true
|
run_once: true
|
||||||
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
|
||||||
|
@ -40,7 +40,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
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user