Skip to content

Commit eb4fb33

Browse files
authored
Merge pull request #452 from a-kpappas/TEAM-11105
Remove unused package ha-cluster-bootstrap from deployment
2 parents 7a697c2 + ebc7d80 commit eb4fb33

2 files changed

Lines changed: 4 additions & 22 deletions

File tree

ansible/playbooks/tasks/aws-cluster-bootstrap.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,9 @@
2626
- credentials
2727
- config
2828

29-
- name: Define base package dependencies list
30-
ansible.builtin.set_fact:
31-
pkg_dependencies: ['corosync', 'crmsh', 'fence-agents', 'pacemaker', 'patterns-ha-ha_sles', 'resource-agents', 'rsyslog', 'socat']
32-
33-
- name: Add extra packages for SLES versions below 16
34-
ansible.builtin.set_fact:
35-
pkg_dependencies: "{{ pkg_dependencies + ['ha-cluster-bootstrap'] }}"
36-
when: ansible_distribution_major_version != '16'
37-
3829
- name: Ensure cluster dependencies are installed
39-
community.general.zypper:
40-
name: "{{ pkg_dependencies }}"
30+
ansible.builtin.package:
31+
name: ['corosync', 'crmsh', 'fence-agents', 'pacemaker', 'patterns-ha-ha_sles', 'resource-agents', 'rsyslog', 'socat']
4132
state: present
4233
register: result
4334
until: result is succeeded

ansible/playbooks/tasks/gcp-cluster-bootstrap.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,9 @@
77
ansible.builtin.set_fact:
88
corosync_template: "../templates/gcp_corosync.conf.j2"
99

10-
- name: Define base package dependencies list
11-
ansible.builtin.set_fact:
12-
pkg_dependencies: ['corosync', 'crmsh', 'fence-agents', 'pacemaker', 'patterns-ha-ha_sles', 'resource-agents', 'rsyslog', 'socat']
13-
14-
- name: Add extra packages for SLES versions below 16
15-
ansible.builtin.set_fact:
16-
pkg_dependencies: "{{ pkg_dependencies + ['ha-cluster-bootstrap'] }}"
17-
when: ansible_distribution_major_version != '16'
18-
1910
- name: Ensure cluster dependencies are installed
20-
community.general.zypper:
21-
name: "{{ pkg_dependencies }}"
11+
ansible.builtin.package:
12+
name: ['corosync', 'crmsh', 'fence-agents', 'pacemaker', 'patterns-ha-ha_sles', 'resource-agents', 'rsyslog', 'socat']
2213
state: present
2314
register: result
2415
until: result is succeeded

0 commit comments

Comments
 (0)