Skip to content

Commit 60c866d

Browse files
tomjelinekrichm
authored andcommitted
test: remove workaround for broken pcs upstream
1 parent 5e3f1cc commit 60c866d

File tree

2 files changed

+2
-35
lines changed

2 files changed

+2
-35
lines changed

tests/tests_not_booted_cluster.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,6 @@
2020
meta: end_host
2121
when: __ha_cluster_is_ostree | d(false)
2222

23-
# Ensure correct test environment - stopped, disabled and not installed
24-
# cluster services. This is needed in case multiple tests are run on
25-
# the same machine in sequence.
26-
- name: Get services status
27-
include_tasks: tasks/handle_service_facts.yml
28-
29-
- name: Ensure cluster daemons are stopped and disabled
30-
service:
31-
name: "{{ item }}"
32-
state: "{{ 'stopped' if __test_is_booted else omit }}"
33-
enabled: false
34-
when: item in __test_service_facts
35-
loop:
36-
- pacemaker.service
37-
- corosync-qdevice.service
38-
- corosync.service
39-
- pcsd.service
40-
4123
# dnf ansible module internally automatically sets 'allowerasing: true'
4224
# when 'state' is set to 'absent'. This allows dnf to remove packages
4325
# which depend on the packages listed in the task. dnf5 ansible module
@@ -89,7 +71,7 @@
8971
- "'pacemaker' in ansible_facts.packages"
9072
- "'pcs' in ansible_facts.packages"
9173

92-
- name: Get services status again
74+
- name: Get services status
9375
include_tasks: tasks/handle_service_facts.yml
9476

9577
- name: Check services status

tests/tests_not_booted_qnetd.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,6 @@
2424
meta: end_host
2525
when: __ha_cluster_is_ostree | d(false)
2626

27-
# Ensure correct test environment - stopped, disabled and not installed
28-
# cluster services. This is needed in case multiple tests are run on
29-
# the same machine in sequence.
30-
- name: Get services status
31-
include_tasks: tasks/handle_service_facts.yml
32-
33-
- name: Ensure cluster daemons are stopped and disabled
34-
service:
35-
name: "{{ item }}"
36-
state: "{{ 'stopped' if __test_is_booted else omit }}"
37-
enabled: false
38-
when: item in __test_service_facts
39-
loop:
40-
- corosync-qnetd.service
41-
4227
- name: Ensure cluster packages are not installed
4328
package:
4429
name:
@@ -65,7 +50,7 @@
6550
that:
6651
- "'corosync-qnetd' in ansible_facts.packages"
6752

68-
- name: Get services status again
53+
- name: Get services status
6954
include_tasks: tasks/handle_service_facts.yml
7055

7156
- name: Check services status

0 commit comments

Comments
 (0)