From 1b03c3debebef016f1851b425a6a657c3ab1df3a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 12 Jul 2018 16:44:21 +0200 Subject: [PATCH] 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: I27326b56cfec69444dae0ca1c7abf0b78ad2299b --- handlers/main.yml | 2 +- tasks/trove_install.yml | 16 ++++++++-------- tasks/trove_service_setup.yml | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 5f17cac..99da08a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -38,6 +38,6 @@ state: "restarted" when: trove_use_mod_wsgi | bool register: apache_restart - until: apache_restart|success + until: apache_restart is success retries: 5 delay: 2 diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml index 98a454c..b0a0c89 100644 --- a/tasks/trove_install.yml +++ b/tasks/trove_install.yml @@ -23,7 +23,7 @@ update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages - until: install_packages|success + until: install_packages is success retries: 5 delay: 2 with_items: "{{ trove_distro_packages }}" @@ -47,7 +47,7 @@ {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ pip_install_options | default('') }} register: install_packages - until: install_packages|success + until: install_packages is success retries: 5 delay: 2 @@ -70,7 +70,7 @@ file: path: "{{ trove_bin | dirname }}" state: absent - when: trove_get_venv | changed + when: trove_get_venv is changed - name: Create trove venv dir file: @@ -78,14 +78,14 @@ state: directory mode: "0755" register: trove_venv_dir - when: trove_get_venv | changed + when: trove_get_venv is changed - name: Unarchive pre-built venv unarchive: src: "/var/cache/{{ trove_venv_download_url | basename }}" dest: "{{ trove_bin | dirname }}" copy: "no" - when: trove_get_venv | changed + when: trove_get_venv is changed notify: - Restart trove API services - Restart trove conductor service @@ -103,7 +103,7 @@ {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ pip_install_options | default('') }} register: install_packages - until: install_packages|success + until: install_packages is success retries: 5 delay: 2 when: trove_get_venv | failed or trove_get_venv | skipped @@ -119,7 +119,7 @@ state: "absent" when: - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - - trove_get_venv | changed + - trove_get_venv is changed # NOTE(odyssey4me): # We reinitialize the venv to ensure that the right @@ -137,7 +137,7 @@ --no-pip \ --no-setuptools \ --no-wheel - when: trove_get_venv | changed + when: trove_get_venv is changed tags: - skip_ansible_lint diff --git a/tasks/trove_service_setup.yml b/tasks/trove_service_setup.yml index 49b2e83..09b0192 100644 --- a/tasks/trove_service_setup.yml +++ b/tasks/trove_service_setup.yml @@ -28,7 +28,7 @@ project_name: "{{ trove_service_project_name }}" description: "{{ trove_service_description }}" register: add_trove_tenant - until: add_trove_tenant |success + until: add_trove_tenant is success retries: 5 delay: 2 no_log: True @@ -49,7 +49,7 @@ service_type: "{{ trove_service_type }}" description: "{{ trove_service_description }}" register: add_trove_service - until: add_trove_service |success + until: add_trove_service is success retries: 5 delay: 2 no_log: True @@ -71,7 +71,7 @@ password: "{{ trove_service_password }}" project_name: "{{ trove_service_project_name }}" register: add_trove_admin_user - until: add_trove_admin_user |success + until: add_trove_admin_user is success retries: 5 delay: 2 no_log: True @@ -94,7 +94,7 @@ insecure: "{{ keystone_service_adminuri_insecure }}" project_name: "{{ trove_service_project_name }}" register: ensure_trove_admin_roles - until: ensure_trove_admin_roles |success + until: ensure_trove_admin_roles is success retries: 5 delay: 2 with_items: "{{ trove_service_admin_role_names }}" @@ -119,7 +119,7 @@ - url: "{{ trove_service_adminurl }}" interface: "admin" register: add_trove_endpoints - until: add_trove_endpoints |success + until: add_trove_endpoints is success retries: 5 delay: 2 no_log: True