From b8de4f529a35f461bfe017e0a2b3eacd396478fd Mon Sep 17 00:00:00 2001 From: Marcel Mamula Date: Fri, 9 Feb 2024 15:59:41 +0000 Subject: [PATCH] ha_cluster_fence_agent_packages defaults update --- defaults/main.yml | 4 +++- tasks/firewall.yml | 4 ++-- tasks/main.yml | 2 +- tasks/selinux.yml | 4 ++-- tasks/shell_crmsh/check-and-prepare-role-variables.yml | 8 -------- tasks/shell_pcs/check-and-prepare-role-variables.yml | 8 -------- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 60af0502..9460ebe5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,7 +13,9 @@ ha_cluster_start_on_boot: true ha_cluster_extra_packages: [] -ha_cluster_fence_agent_packages: [] +# Default fence agent packages are defined in respective os_family var files +ha_cluster_fence_agent_packages: + "{{ __ha_cluster_fence_agent_packages_default }}" ha_cluster_hacluster_password: "" ha_cluster_regenerate_keys: false diff --git a/tasks/firewall.yml b/tasks/firewall.yml index a580eb9a..49854cb4 100644 --- a/tasks/firewall.yml +++ b/tasks/firewall.yml @@ -7,9 +7,9 @@ # noqa: var-naming[no-role-prefix] __arch: "{{ ansible_facts['architecture'] }}" __use_fence_fw_port: "{{ __arch == 'x86_64' and - ('fence-virt' in __ha_cluster_fence_agent_packages_final + ('fence-virt' in ha_cluster_fence_agent_packages or 'fence-virt' in ha_cluster_extra_packages - or 'fence-agents-all' in __ha_cluster_fence_agent_packages_final + or 'fence-agents-all' in ha_cluster_fence_agent_packages or 'fence-agents-all' in ha_cluster_extra_packages) }}" __fence_fw_port: "{{ [{'port': '1229/tcp', 'state': 'enabled'}] if __use_fence_fw_port else [] }}" diff --git a/tasks/main.yml b/tasks/main.yml index f2352733..3e20c8a3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -57,7 +57,7 @@ + ha_cluster_sbd_enabled | ternary(__ha_cluster_sbd_packages, []) + - __ha_cluster_fence_agent_packages_final }}" + ha_cluster_fence_agent_packages }}" state: present use: "{{ (__ha_cluster_is_ostree | d(false)) | ternary('ansible.posix.rhel_rpm_ostree', omit) }}" diff --git a/tasks/selinux.yml b/tasks/selinux.yml index 88d8ee1e..33b353c2 100644 --- a/tasks/selinux.yml +++ b/tasks/selinux.yml @@ -17,11 +17,11 @@ when: - ansible_facts['architecture'] == 'x86_64' - ( - 'fence-virt' in __ha_cluster_fence_agent_packages_final + 'fence-virt' in ha_cluster_fence_agent_packages or 'fence-virt' in ha_cluster_extra_packages or - 'fence-agents-all' in __ha_cluster_fence_agent_packages_final + 'fence-agents-all' in ha_cluster_fence_agent_packages or 'fence-agents-all' in ha_cluster_extra_packages ) diff --git a/tasks/shell_crmsh/check-and-prepare-role-variables.yml b/tasks/shell_crmsh/check-and-prepare-role-variables.yml index 00c77d0d..08b2a75f 100644 --- a/tasks/shell_crmsh/check-and-prepare-role-variables.yml +++ b/tasks/shell_crmsh/check-and-prepare-role-variables.yml @@ -125,11 +125,3 @@ - ha_cluster_quorum.options | d([]) | selectattr('name', 'match', '^auto_tie_breaker$') | map(attribute='value') | select('in', ['0', 0]) | list | length > 0 - -# Sets fence agent list from os_familu vars depending on user input. -- name: Set __ha_cluster_fence_agent_packages_final fact - ansible.builtin.set_fact: - __ha_cluster_fence_agent_packages_final: - "{{ (ha_cluster_fence_agent_packages | length == 0) | - ternary(__ha_cluster_fence_agent_packages_default, - ha_cluster_fence_agent_packages) }}" diff --git a/tasks/shell_pcs/check-and-prepare-role-variables.yml b/tasks/shell_pcs/check-and-prepare-role-variables.yml index ccf17a24..e7185fa1 100644 --- a/tasks/shell_pcs/check-and-prepare-role-variables.yml +++ b/tasks/shell_pcs/check-and-prepare-role-variables.yml @@ -202,11 +202,3 @@ and not 'pcmk.properties.operation-defaults.multiple' in __ha_cluster_pcs_capabilities ) - -# Sets fence agent list from os_familu vars depending on user input. -- name: Set __ha_cluster_fence_agent_packages_final fact - ansible.builtin.set_fact: - __ha_cluster_fence_agent_packages_final: - "{{ (ha_cluster_fence_agent_packages | length == 0) | - ternary(__ha_cluster_fence_agent_packages_default, - ha_cluster_fence_agent_packages) }}"