Skip to content

Commit 0351666

Browse files
Fix difference issue in Ansible during remove
1 parent d151da6 commit 0351666

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

playbooks/roles/destroy_unreachable/tasks/slurm-rack-aware.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@
114114

115115
# - name: debug
116116
# debug:
117-
# msg: "Replacing line: SwitchName={{upperswitchnames[item]}}\\sSwitches.* with SwitchName={{upperswitchnames[item]}} Switches={{racks_on_switch_dict[item] | difference(switchnames[item]) | join(',') }}"
117+
# msg: "Replacing line: SwitchName={{upperswitchnames[item]}}\\sSwitches.* with SwitchName={{upperswitchnames[item]}} Switches={{racks_on_switch_dict[item] | difference([switchnames[item]]) | join(',') }}"
118118
# with_items: "{{unreachable_slurm_nodes}}"
119-
# when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference(switchnames[item]) | length ) > 0 ) and ( upperswitchnames[item] | length ) > 1
119+
# when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference([switchnames[item]]) | length ) > 0 ) and ( upperswitchnames[item] | length ) > 1
120120
# run_once: true
121121
# delegate_to: 127.0.0.1
122122

123123
- name: change upper switch line from topology line
124124
lineinfile:
125125
path: "{{ slurm_conf_path }}/topology.conf"
126126
regexp: "SwitchName={{upperswitchnames[item]}}\\sSwitches.*"
127-
line: "SwitchName={{upperswitchnames[item]}} Switches={{racks_on_switch_dict[item] | difference(switchnames[item]) | join(',') }}"
127+
line: "SwitchName={{upperswitchnames[item]}} Switches={{racks_on_switch_dict[item] | difference([switchnames[item]]) | join(',') }}"
128128
state: present
129129
with_items: "{{unreachable_slurm_nodes}}"
130130
ignore_errors: yes
131-
when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference(switchnames[item]) | length ) > 0 ) and ( upperswitchnames[item] | length ) > 1 and ( nodes_on_switch[item] | length ) < 2
131+
when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference([switchnames[item]]) | length ) > 0 ) and ( upperswitchnames[item] | length ) > 1 and ( nodes_on_switch[item] | length ) < 2
132132
run_once: true
133133
delegate_to: 127.0.0.1
134134

@@ -137,7 +137,7 @@
137137
# msg: "removing line line: SwitchName={{upperswitchnames[item]}}\\sSwitches.*"
138138
# with_items: "{{unreachable_slurm_nodes}}"
139139
# ignore_unreachable: yes
140-
# when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference(switchnames[item]) | length ) == 0 ) and ( upperswitchnames[item] | length ) > 1
140+
# when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference([switchnames[item]]) | length ) == 0 ) and ( upperswitchnames[item] | length ) > 1
141141
# run_once: true
142142
# delegate_to: 127.0.0.1
143143

@@ -148,7 +148,7 @@
148148
state: absent
149149
with_items: "{{unreachable_slurm_nodes}}"
150150
ignore_unreachable: yes
151-
when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference(switchnames[item]) | length ) == 0 ) and ( upperswitchnames[item] | length ) > 1 and ( nodes_on_switch[item] | length ) < 2
151+
when: ( not upperswitchnames[item] is match("inactive-.*") ) and ( ( racks_on_switch_dict[item] | difference([switchnames[item]]) | length ) == 0 ) and ( upperswitchnames[item] | length ) > 1 and ( nodes_on_switch[item] | length ) < 2
152152
run_once: true
153153
delegate_to: 127.0.0.1
154154

0 commit comments

Comments
 (0)