diff --git a/handlers/main.yml b/handlers/main.yml index a20cd572..c2e334d4 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -20,7 +20,7 @@ state: restarted daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" register: _restart - until: _restart | success + until: _restart is success retries: 5 delay: 2 @@ -33,7 +33,7 @@ - "{{ keystone_service_port }}" - "{{ keystone_admin_port }}" register: _wait_check - until: _wait_check | success + until: _wait_check is success retries: 5 listen: "Restart web server" @@ -43,7 +43,7 @@ state: "stopped" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" register: _stop - until: _stop | success + until: _stop is success retries: 5 delay: 2 with_items: "{{ keystone_services.keys() | list }}" @@ -82,7 +82,7 @@ state: "started" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" register: _start - until: _start | success + until: _start is success retries: 5 delay: 2 with_items: "{{ keystone_services.keys() | list }}" @@ -97,7 +97,7 @@ - "{{ keystone_uwsgi_ports['keystone-wsgi-admin']['socket'] }}" - "{{ keystone_uwsgi_ports['keystone-wsgi-public']['socket'] }}" register: _wait_check - until: _wait_check | success + until: _wait_check is success retries: 5 listen: "Restart uWSGI" @@ -108,7 +108,7 @@ state: "restarted" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" register: _restart - until: _restart | success + until: _restart is success retries: 5 delay: 2 diff --git a/tasks/keystone_credential_create.yml b/tasks/keystone_credential_create.yml index 87b7584f..9ed1b647 100644 --- a/tasks/keystone_credential_create.yml +++ b/tasks/keystone_credential_create.yml @@ -80,7 +80,7 @@ register: create_credential_keys when: - not _credential_keys.stat.exists - - not drop_existing_credential_keys | changed + - not drop_existing_credential_keys is changed - name: Ensure newest key is used for credential in Keystone command: > diff --git a/tasks/keystone_db_setup.yml b/tasks/keystone_db_setup.yml index 80f91710..8a2b8758 100644 --- a/tasks/keystone_db_setup.yml +++ b/tasks/keystone_db_setup.yml @@ -83,7 +83,7 @@ name: "{{ item.name }}" state: stopped register: _stop - until: _stop | success + until: _stop is success retries: 5 delay: 2 with_items: "{{ keystone_service_exists.results }}" diff --git a/tasks/keystone_idp_self_signed_distribute.yml b/tasks/keystone_idp_self_signed_distribute.yml index a556497f..86d88cfb 100644 --- a/tasks/keystone_idp_self_signed_distribute.yml +++ b/tasks/keystone_idp_self_signed_distribute.yml @@ -26,7 +26,7 @@ - { src: "{{ keystone_idp.certfile }}", name: "keystone_idp_cert", file_mode: "0640", dir_mode: "0750" } - { src: "{{ keystone_idp.keyfile }}", name: "keystone_idp_key", file_mode: "0640", dir_mode: "0750" } register: memcache_keys - until: memcache_keys|success + until: memcache_keys is success retries: 5 delay: 2 notify: diff --git a/tasks/keystone_idp_self_signed_store.yml b/tasks/keystone_idp_self_signed_store.yml index b9af1d67..05c19f6f 100644 --- a/tasks/keystone_idp_self_signed_store.yml +++ b/tasks/keystone_idp_self_signed_store.yml @@ -24,6 +24,6 @@ - { src: "{{ keystone_idp.certfile }}", name: "keystone_idp_cert" } - { src: "{{ keystone_idp.keyfile }}", name: "keystone_idp_key" } register: memcache_keys - until: memcache_keys|success + until: memcache_keys is success retries: 5 delay: 2 diff --git a/tasks/keystone_idp_sp_setup.yml b/tasks/keystone_idp_sp_setup.yml index e2459a66..53a71cfc 100644 --- a/tasks/keystone_idp_sp_setup.yml +++ b/tasks/keystone_idp_sp_setup.yml @@ -26,6 +26,6 @@ with_items: "{{ keystone_idp.service_providers | default([]) }}" no_log: true register: add_service_providers - until: add_service_providers|success + until: add_service_providers is success retries: 5 delay: 10 diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml index 876fec3d..03623e21 100644 --- a/tasks/keystone_install.yml +++ b/tasks/keystone_install.yml @@ -88,7 +88,7 @@ update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | 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 notify: diff --git a/tasks/keystone_install_source.yml b/tasks/keystone_install_source.yml index 770c1508..540a708f 100644 --- a/tasks/keystone_install_source.yml +++ b/tasks/keystone_install_source.yml @@ -31,7 +31,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 @@ -54,21 +54,21 @@ file: path: "{{ keystone_bin | dirname }}" state: absent - when: keystone_get_venv | changed + when: keystone_get_venv is changed - name: Create keystone venv dir file: path: "{{ keystone_bin | dirname }}" state: directory register: keystone_venv_dir - when: keystone_get_venv | changed + when: keystone_get_venv is changed - name: Unarchive pre-built venv unarchive: src: "/var/cache/{{ keystone_venv_download_url | basename }}" dest: "{{ keystone_bin | dirname }}" copy: "no" - when: keystone_get_venv | changed + when: keystone_get_venv is changed notify: - Manage LB - Restart uWSGI @@ -85,7 +85,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: keystone_get_venv | failed or keystone_get_venv | skipped @@ -100,7 +100,7 @@ state: "absent" when: - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - - keystone_get_venv | changed + - keystone_get_venv is changed # NOTE(odyssey4me): # # We reinitialize the venv to ensure that the right @@ -118,7 +118,7 @@ --no-pip \ --no-setuptools \ --no-wheel - when: keystone_get_venv | changed + when: keystone_get_venv is changed tags: - skip_ansible_lint diff --git a/tasks/keystone_service_setup.yml b/tasks/keystone_service_setup.yml index 134fb49b..fb44f658 100644 --- a/tasks/keystone_service_setup.yml +++ b/tasks/keystone_service_setup.yml @@ -22,7 +22,7 @@ - "http://{{ ansible_host }}:{{ keystone_uwsgi_ports['keystone-wsgi-admin']['http'] }}" - "http://{{ ansible_host }}:{{ keystone_uwsgi_ports['keystone-wsgi-public']['http'] }}" register: _wait_check - until: _wait_check | success + until: _wait_check is success retries: 12 delay: 5 @@ -43,7 +43,7 @@ become_user: "{{ keystone_system_user_name }}" changed_when: false register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10 @@ -60,7 +60,7 @@ description: "{{ keystone_service_description }}" no_log: true register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10 @@ -77,7 +77,7 @@ no_log: true register: add_member_role when: not keystone_service_in_ldap | bool - until: add_member_role|success + until: add_member_role is success retries: 5 delay: 10 @@ -95,7 +95,7 @@ description: "{{ keystone_service_description }}" no_log: true register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10 @@ -113,7 +113,7 @@ password: "{{ keystone_service_password }}" no_log: true register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10 @@ -131,7 +131,7 @@ role_name: "{{ keystone_role_name }}" no_log: true register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10 @@ -156,6 +156,6 @@ interface: "admin" no_log: true register: add_service - until: add_service|success + until: add_service is success retries: 5 delay: 10