openstack
/
openstack-ansible-galera_server
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables 

See https://github.com/ansible/ansible/issues/73654

Change-Id: I88dc5a3da8b8abe801eb533ec93cffdbeed7bd65
This commit is contained in:
Jonathan Rosser 2021-02-23 08:32:22 +00:00
parent 3d07a246d5
commit 374b64435e
14 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@ -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

2
meta/main.yml
View File

@ -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'

2
tasks/galera_client_main.yml
View File

@ -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

8
tasks/galera_install_portage.yml
View File

@ -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

4
tasks/galera_install_yum.yml
View File

@ -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

2
tasks/galera_server_install.yml
View File

@ -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:

16
tasks/galera_server_post_install.yml
View File

@ -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:

2
tasks/galera_server_upgrade_pre.yml
View File

@ -72,4 +72,4 @@
retries: 5
delay: 2
when:
- ansible_pkg_mgr == "apt"
- ansible_facts['pkg_mgr'] == "apt"

10
tasks/main.yml
View File

@ -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

2
templates/my.cnf.j2
View File

@ -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 %}

2
templates/mysql_defaults.j2
View File

@ -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 %}

4
vars/debian.yml
View File

@ -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"

2
vars/redhat.yml
View File

@ -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"

2
vars/suse.yml
View File

@ -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