From 082ad70c3113aa8f42a6966efbc708c4b7489f45 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 16 Mar 2021 07:18:10 +0000 Subject: [PATCH] Use ansible_facts[] instead of fact variables See https://github.com/ansible/ansible/issues/73654 Change-Id: Ifb8dfacf44ac5537dea5ee4480350e6c93c2450a --- defaults/main.yml | 8 ++++---- meta/main.yml | 2 +- tasks/main.yml | 10 +++++----- tasks/octavia_certs.yml | 4 ++-- tasks/octavia_install.yml | 4 ++-- tasks/octavia_post_install.yml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ac014d9c..3a05b6a1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,7 +20,7 @@ debug: False # for the service setup. The host must already have # clouds.yaml properly configured. octavia_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" -octavia_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((octavia_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +octavia_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((octavia_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" # Set installation method. octavia_install_method: "{{ service_install_method | default('source') }}" @@ -64,7 +64,7 @@ octavia_cinder_enabled: False ## Database info octavia_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" -octavia_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((octavia_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +octavia_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((octavia_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" octavia_galera_address: "{{ galera_address | default('127.0.0.1') }}" octavia_galera_user: octavia octavia_galera_database: octavia @@ -255,7 +255,7 @@ octavia_security_group_rule_cidr: octavia_ssh_enabled: False octavia_ssh_key_name: octavia_key octavia_keypair_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" -octavia_keypair_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((octavia_keypair_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +octavia_keypair_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((octavia_keypair_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" # port the agent listens on octavia_agent_port: "9443" octavia_health_manager_port: 5555 @@ -405,7 +405,7 @@ octavia_iptables_rules: # uWSGI Settings octavia_wsgi_processes_max: 16 -octavia_wsgi_processes: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, octavia_wsgi_processes_max] | min }}" +octavia_wsgi_processes: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, octavia_wsgi_processes_max] | min }}" octavia_wsgi_threads: 1 octavia_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" octavia_api_uwsgi_ini_overrides: {} diff --git a/meta/main.yml b/meta/main.yml index 914798ff..b230f55c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -36,4 +36,4 @@ galaxy_info: dependencies: - role: apt_package_pinning when: - - ansible_pkg_mgr == 'apt' + - ansible_facts['pkg_mgr'] == 'apt' diff --git a/tasks/main.yml b/tasks/main.yml index eccb08c6..050eea32 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,11 +26,11 @@ - 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 }}.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 }}.yml" tags: - always diff --git a/tasks/octavia_certs.yml b/tasks/octavia_certs.yml index a30b4fdf..8e7bd34a 100644 --- a/tasks/octavia_certs.yml +++ b/tasks/octavia_certs.yml @@ -22,7 +22,7 @@ delegate_to: "{{ octavia_cert_setup_host }}" vars: ansible_python_interpreter: >- - {{ (octavia_cert_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + {{ (octavia_cert_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']) }} block: - name: Create certificate directories file: @@ -107,7 +107,7 @@ delegate_to: "{{ octavia_cert_setup_host }}" vars: ansible_python_interpreter: >- - {{ (octavia_cert_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + {{ (octavia_cert_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']) }} when: octavia_generate_client_cert | bool block: - name: Create the client CAs private key diff --git a/tasks/octavia_install.yml b/tasks/octavia_install.yml index f7916e45..5d0a88c8 100644 --- a/tasks/octavia_install.yml +++ b/tasks/octavia_install.yml @@ -16,8 +16,8 @@ package: name: "{{ octavia_package_list }}" state: "{{ octavia_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 diff --git a/tasks/octavia_post_install.yml b/tasks/octavia_post_install.yml index 20f6eb7a..3a623d72 100644 --- a/tasks/octavia_post_install.yml +++ b/tasks/octavia_post_install.yml @@ -26,12 +26,12 @@ - name: save iptables rules (Debian/Ubuntu) command: netfilter-persistent save ignore_errors: yes - when: ansible_os_family == 'Debian' + when: ansible_facts['os_family'] == 'Debian' - name: save iptables rules (CentOS) shell: iptables-save > /etc/sysconfig/iptables when: - - ansible_distribution == 'CentOS' + - ansible_facts['distribution'] == 'CentOS' - name: Copy user provided HAProxy templates copy: