Skip to content

Commit 395047e

Browse files
idevatrichm
authored andcommitted
test: simplify expected cluster properties
1 parent dfa25fc commit 395047e

12 files changed

+12
-14
lines changed

tests/tests_cib_properties_empty.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
ha_cluster_cluster_properties:
6666
- attrs:
6767
- name: stonith-watchdog-timeout
68-
value: "{{ha_cluster_sbd_enabled | ternary('', '0') }}"
68+
value: "0"
6969
ha_cluster_start_on_boot: true
7070
ha_cluster_transport:
7171
type: knet

tests/tests_cib_properties_one_set.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
- name: stonith-enabled
101101
value: 'true'
102102
- name: stonith-watchdog-timeout
103-
value: "{{ha_cluster_sbd_enabled | ternary('', '0') }}"
103+
value: "0"
104104
ha_cluster_start_on_boot: true
105105
ha_cluster_transport:
106106
type: knet

tests/tests_cib_rsc_op_defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
ha_cluster_cluster_properties:
214214
- attrs:
215215
- name: stonith-watchdog-timeout
216-
value: "{{ha_cluster_sbd_enabled | ternary('', '0') }}"
216+
value: "0"
217217
ha_cluster_start_on_boot: true
218218
ha_cluster_transport:
219219
type: knet

tests/tests_cluster_advanced_knet_full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
"ha_cluster_cluster_properties": [{
180180
"attrs": [{
181181
"name": "stonith-watchdog-timeout",
182-
"value": ha_cluster_sbd_enabled | ternary('', '0')
182+
"value": "0"
183183
}]
184184
}]
185185
}, {})

tests/tests_cluster_advanced_knet_implicit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"ha_cluster_cluster_properties": [{
101101
"attrs": [{
102102
"name": "stonith-watchdog-timeout",
103-
"value": ha_cluster_sbd_enabled | ternary('', '0')
103+
"value": "0"
104104
}]
105105
}]
106106
}, {})

tests/tests_cluster_advanced_udp_full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"ha_cluster_cluster_properties": [{
125125
"attrs": [{
126126
"name": "stonith-watchdog-timeout",
127-
"value": ha_cluster_sbd_enabled | ternary('', '0')
127+
"value": "0"
128128
}]
129129
}]
130130
}, {})

tests/tests_cluster_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"ha_cluster_cluster_properties": [{
158158
"attrs": [{
159159
"name": "stonith-watchdog-timeout",
160-
"value": ha_cluster_sbd_enabled | ternary('', '0')
160+
"value": "0"
161161
}]
162162
}]
163163
}, {})

tests/tests_cluster_basic_cloud_packages.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@
102102
"ha_cluster_cluster_properties": [{
103103
"attrs": [{
104104
"name": "stonith-watchdog-timeout",
105-
"value": ha_cluster_sbd_enabled
106-
| d(False) | ternary('', '0')
105+
"value": "0"
107106
}]
108107
}]
109108
}, {})

tests/tests_cluster_basic_disabled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"ha_cluster_cluster_properties": [{
8383
"attrs": [{
8484
"name": "stonith-watchdog-timeout",
85-
"value": ha_cluster_sbd_enabled | ternary('', '0')
85+
"value": "0"
8686
}]
8787
}]
8888
}, {})

tests/tests_export_doesnt_destroy_cluster.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
"ha_cluster_cluster_properties": [{
6060
"attrs": [{
6161
"name": "stonith-watchdog-timeout",
62-
"value": ha_cluster_sbd_enabled | d(False)
63-
| ternary('', '0')
62+
"value": "0"
6463
}]
6564
}]
6665
}, {})

0 commit comments

Comments
 (0)