From 374b64435e004c154bf84a860bb3282c4241f6c0 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 23 Feb 2021 08:32:22 +0000 Subject: [PATCH] Use ansible_facts[] instead of fact variables See https://github.com/ansible/ansible/issues/73654 Change-Id: I88dc5a3da8b8abe801eb533ec93cffdbeed7bd65 --- defaults/main.yml | 6 +++--- meta/main.yml | 2 +- tasks/galera_client_main.yml | 2 +- tasks/galera_install_portage.yml | 8 ++++---- tasks/galera_install_yum.yml | 4 ++-- tasks/galera_server_install.yml | 2 +- tasks/galera_server_post_install.yml | 16 ++++++++-------- tasks/galera_server_upgrade_pre.yml | 2 +- tasks/main.yml | 10 +++++----- templates/my.cnf.j2 | 2 +- templates/mysql_defaults.j2 | 2 +- vars/debian.yml | 4 ++-- vars/redhat.yml | 2 +- vars/suse.yml | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0650c6ab..1ae2a8eb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -123,7 +123,7 @@ galera_wsrep_cluster_address: >- galera_wsrep_node_incoming_address: "{{ galera_wsrep_address }}" ## Cap the maximum number of threads / workers when a user value is unspecified. galera_wsrep_slave_threads_max: 16 -galera_wsrep_slave_threads: "{{ [[ansible_processor_vcpus|default(2), 2] | max, galera_wsrep_slave_threads_max] | min }}" +galera_wsrep_slave_threads: "{{ [[ansible_facts['processor_vcpus']|default(2), 2] | max, galera_wsrep_slave_threads_max] | min }}" galera_wsrep_retry_autocommit: 3 galera_wsrep_debug: NONE galera_wsrep_sst_method: mariabackup @@ -151,7 +151,7 @@ galera_debian_cnf_overrides: {} # if deploying galera on different hardware. # galera_max_connections: 500 -# This is only applied if the ansible_pkg_mgr is 'apt' +# This is only applied if the ansible_facts['pkg_mgr'] is 'apt' galera_distro_package_pins: - package: '*' release: MariaDB @@ -208,7 +208,7 @@ galera_ssl_server: "{{ (galera_cluster_members | default(['localhost']))[0] }}" ## Database info galera_db_setup_host: "{{ openstack_db_setup_host | default(galera_cluster_members[0] | default('localhost')) }}" -galera_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((galera_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" +galera_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((galera_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" # Configure backups of database # copies is the number of full backups to be kept, the corresponding diff --git a/meta/main.yml b/meta/main.yml index 8bbe518c..59037ad0 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -44,4 +44,4 @@ dependencies: apt_pinned_packages: "{{ galera_distro_package_pins }}" apt_package_pinning_file_name: "galera_pin.pref" when: - - ansible_pkg_mgr == 'apt' + - ansible_facts['pkg_mgr'] == 'apt' diff --git a/tasks/galera_client_main.yml b/tasks/galera_client_main.yml index 2b8972b4..97778823 100644 --- a/tasks/galera_client_main.yml +++ b/tasks/galera_client_main.yml @@ -17,7 +17,7 @@ set_fact: galera_packages_list: "{{ galera_client_distro_packages }}" -- include_tasks: "galera_install_{{ ansible_pkg_mgr }}.yml" +- include_tasks: "galera_install_{{ ansible_facts['pkg_mgr'] }}.yml" when: - galera_client_package_install | bool diff --git a/tasks/galera_install_portage.yml b/tasks/galera_install_portage.yml index ef8740e3..de3224e6 100644 --- a/tasks/galera_install_portage.yml +++ b/tasks/galera_install_portage.yml @@ -17,10 +17,10 @@ package: name: "{{ galera_packages_list }}" state: "{{ galera_package_state }}" - newuse: "{{ (ansible_pkg_mgr == 'portage') | ternary('yes', omit) }}" - changed_use: "{{ (ansible_pkg_mgr == 'portage') | ternary('yes', omit) }}" - noreplace: "{{ (ansible_pkg_mgr == 'portage') | ternary('yes', omit) }}" - jobs: "{{ (ansible_pkg_mgr == 'portage') | ternary('4', omit) }}" + newuse: "{{ (ansible_facts['pkg_mgr'] == 'portage') | ternary('yes', omit) }}" + changed_use: "{{ (ansible_facts['pkg_mgr'] == 'portage') | ternary('yes', omit) }}" + noreplace: "{{ (ansible_facts['pkg_mgr'] == 'portage') | ternary('yes', omit) }}" + jobs: "{{ (ansible_facts['pkg_mgr'] == 'portage') | ternary('4', omit) }}" register: install_remote_packages until: install_remote_packages is success retries: 5 diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml index cdb74118..7b5834cd 100644 --- a/tasks/galera_install_yum.yml +++ b/tasks/galera_install_yum.yml @@ -123,7 +123,7 @@ line: "module_hotfixes=1" regexp: "^module_hotfixes" insertafter: "^enabled" - when: ansible_distribution_major_version is version('8', '>=') + when: ansible_facts['distribution_major_version'] is version('8', '>=') # When changing the repo URL, the metadata does # not reliably update, resulting in the right @@ -131,7 +131,7 @@ # This is why we force the metadata to be # cleaned out whenever the repo config changes. - name: Force the expiry of the repo metadata - command: "{{ ansible_pkg_mgr }} clean metadata" + command: "{{ ansible_facts['pkg_mgr'] }} clean metadata" args: warn: no when: add_galera_repos is changed diff --git a/tasks/galera_server_install.yml b/tasks/galera_server_install.yml index ea27a900..5226fa78 100644 --- a/tasks/galera_server_install.yml +++ b/tasks/galera_server_install.yml @@ -17,7 +17,7 @@ set_fact: galera_packages_list: "{{ galera_server_required_distro_packages + galera_server_mariadb_distro_packages }}" -- include_tasks: "galera_install_{{ ansible_pkg_mgr }}.yml" +- include_tasks: "galera_install_{{ ansible_facts['pkg_mgr'] }}.yml" - name: Record galera has been deployed ini_file: diff --git a/tasks/galera_server_post_install.yml b/tasks/galera_server_post_install.yml index 175f3652..05791824 100644 --- a/tasks/galera_server_post_install.yml +++ b/tasks/galera_server_post_install.yml @@ -53,8 +53,8 @@ dest: "/usr/local/bin/galera_secure_node" mode: "0750" when: - - ansible_pkg_mgr != "apt" - - ansible_pkg_mgr != "portage" + - ansible_facts['pkg_mgr'] != "apt" + - ansible_facts['pkg_mgr'] != "portage" - not galera_upgrade - name: Run galera secure @@ -63,8 +63,8 @@ creates: "/var/lib/mysql/osa_default_secured" warn: no when: - - ansible_pkg_mgr != "apt" - - ansible_pkg_mgr != "portage" + - ansible_facts['pkg_mgr'] != "apt" + - ansible_facts['pkg_mgr'] != "portage" - not galera_upgrade tags: - skip_ansible_lint @@ -118,7 +118,7 @@ dest: /etc/mysql/debian.cnf config_overrides: "{{ galera_debian_cnf_overrides }}" config_type: "ini" - condition: "{{ (ansible_os_family | lower == 'debian') }}" + condition: "{{ (ansible_facts['os_family'] | lower == 'debian') }}" - src: "client.my.cnf.j2" dest: "/root/.my.cnf" config_overrides: "{{ galera_client_my_cnf_overrides }}" @@ -133,7 +133,7 @@ command: "emerge --config dev-db/mariadb" failed_when: false when: - - ansible_pkg_mgr == 'portage' + - ansible_facts['pkg_mgr'] == 'portage' - name: Apply service defaults template: @@ -141,7 +141,7 @@ dest: "/etc/default/mariadb" mode: "0644" when: - - ansible_pkg_mgr != 'portage' + - ansible_facts['pkg_mgr'] != 'portage' notify: - Manage LB - Restart all mysql @@ -154,7 +154,7 @@ state: "link" force: "yes" when: - - ansible_pkg_mgr != 'portage' + - ansible_facts['pkg_mgr'] != 'portage' - name: remove default mysql_safe_syslog file: diff --git a/tasks/galera_server_upgrade_pre.yml b/tasks/galera_server_upgrade_pre.yml index 329524db..8b331059 100644 --- a/tasks/galera_server_upgrade_pre.yml +++ b/tasks/galera_server_upgrade_pre.yml @@ -72,4 +72,4 @@ retries: 5 delay: 2 when: - - ansible_pkg_mgr == "apt" + - ansible_facts['pkg_mgr'] == "apt" diff --git a/tasks/main.yml b/tasks/main.yml index 3c4df25f..5ce2ea16 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,11 +16,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/templates/my.cnf.j2 b/templates/my.cnf.j2 index 582f6978..46519cd7 100644 --- a/templates/my.cnf.j2 +++ b/templates/my.cnf.j2 @@ -1,6 +1,6 @@ {%- set all_calculated_max_connections = [] %} {%- for galera_node in galera_cluster_members %} - {%- set vcpus = hostvars[galera_node]['ansible_processor_vcpus'] %} + {%- set vcpus = hostvars[galera_node]['ansible_facts']['processor_vcpus'] %} {%- if all_calculated_max_connections.append([[vcpus|default(2), 2] | max, galera_wsrep_slave_threads_max] | min * 100) %} {%- endif %} {%- endfor %} diff --git a/templates/mysql_defaults.j2 b/templates/mysql_defaults.j2 index 4c056e0b..5fa9e5d9 100644 --- a/templates/mysql_defaults.j2 +++ b/templates/mysql_defaults.j2 @@ -2,7 +2,7 @@ {%- set all_calculated_max_connections = [] %} {%- for galera_node in galera_cluster_members %} - {%- set vcpus = hostvars[galera_node]['ansible_processor_vcpus'] %} + {%- set vcpus = hostvars[galera_node]['ansible_facts']['processor_vcpus'] %} {%- set _ = all_calculated_max_connections.append([[vcpus|default(2), 2] | max, galera_wsrep_slave_threads_max] | min * 100) %} {%- endfor %} {%- set calculated_min_connections = all_calculated_max_connections | min %} diff --git a/vars/debian.yml b/vars/debian.yml index 841ebcfe..6cc364ba 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -74,9 +74,9 @@ galera_debconf_items: vtype: "string" # Repositories -_galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/repo/{{ ansible_distribution | lower }}" +_galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/repo/{{ ansible_facts['distribution'] | lower }}" _galera_repo: - repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main" + repo: "deb {{ galera_repo_url }} {{ ansible_facts['distribution_release'] }} main" state: "present" filename: "MariaDB" diff --git a/vars/redhat.yml b/vars/redhat.yml index 637a239d..e3ce58d2 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -32,7 +32,7 @@ galera_server_required_distro_packages: - libgcrypt - MariaDB-client - MariaDB-devel - - "{{ ansible_distribution_major_version is version('8', '<') | ternary('MySQL-python', 'python3-PyMySQL') }}" # needed by mysql_user + - "{{ ansible_facts['distribution_major_version'] is version('8', '<') | ternary('MySQL-python', 'python3-PyMySQL') }}" # needed by mysql_user - xinetd galera_etc_conf_file: "/etc/mysql/my.cnf" diff --git a/vars/suse.yml b/vars/suse.yml index e3887886..36be98e6 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -59,7 +59,7 @@ galera_server_upgrade_packages_remove: - MariaDB-Galera-server - MariaDB-server -_galera_opensuse_dir: "{{ ansible_distribution_major_version }}" +_galera_opensuse_dir: "{{ ansible_facts['distribution_major_version'] }}" _galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/opensuse{{ _galera_opensuse_dir }}-amd64" _galera_repo: name: MariaDB