From 481d5e49d7acf98382d8bc169c2e248b68e89ded Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 15 Mar 2021 18:27:28 +0000 Subject: [PATCH] Use ansible_facts[] instead of fact variables See https://github.com/ansible/ansible/issues/73654 Change-Id: Iddd575ea7859e496a659a01a454e87d27e85fb1f --- defaults/main.yml | 6 +++--- handlers/main.yml | 4 ++-- tasks/main.yml | 12 ++++++------ tasks/mistral_install.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e66f901..ea9f7c6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -82,7 +82,7 @@ mistral_services: # UWSGI settings mistral_wsgi_processes_max: 16 -mistral_wsgi_processes: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, mistral_wsgi_processes_max] | min }}" +mistral_wsgi_processes: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, mistral_wsgi_processes_max] | min }}" mistral_wsgi_threads: 1 # RPC @@ -111,7 +111,7 @@ mistral_oslomsg_amqp1_enabled: "{{ mistral_oslomsg_rpc_transport == 'amqp' }}" # Database mistral_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" -mistral_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((mistral_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +mistral_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((mistral_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" mistral_galera_address: "{{ galera_address | default('127.0.0.1') }}" mistral_galera_database: mistral mistral_galera_user: mistral @@ -133,7 +133,7 @@ mistral_policy_overrides: {} # Service setup mistral_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" -mistral_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((mistral_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +mistral_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((mistral_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" mistral_service_name: mistral mistral_service_type: workflowv2 mistral_service_description: OpenStack Workflow service diff --git a/handlers/main.yml b/handlers/main.yml index b9cb043..0a2c9a5 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,7 +18,7 @@ name: "{{ item.service_name }}" enabled: yes state: "stopped" - daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" + daemon_reload: yes with_items: "{{ filtered_mistral_services }}" register: _stop until: _stop is success @@ -65,7 +65,7 @@ name: "{{ item.service_name }}" enabled: yes state: "started" - daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" + daemon_reload: yes with_items: "{{ filtered_mistral_services }}" register: _start until: _start is success diff --git a/tasks/main.yml b/tasks/main.yml index b6706c4..54d286d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,12 +16,12 @@ - name: Gather variables for each operating system include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml" - - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - - "{{ ansible_distribution | lower }}.yml" - - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml" - - "{{ ansible_os_family | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml" + - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}.yml" + - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml" + - "{{ ansible_facts['os_family'] | lower }}.yml" tags: - always diff --git a/tasks/mistral_install.yml b/tasks/mistral_install.yml index ecabd67..2745217 100644 --- a/tasks/mistral_install.yml +++ b/tasks/mistral_install.yml @@ -61,8 +61,8 @@ package: name: "{{ mistral_package_list }}" state: "{{ mistral_package_state }}" - update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" - cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" + update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages until: install_packages is success retries: 5