From dc2c531947657cfff2c9efc172faef4385129fcd Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 3 Aug 2022 22:27:44 -0400 Subject: [PATCH 1/3] Disallow multi-line var second_gateway_found ~= exclude_devices --- roles/network/tasks/detected_network.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 51a85ce86..976e46987 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -142,6 +142,10 @@ register: second_gateway_found changed_when: False +- assert: + that: second_gateway_found.stdout_lines | length == 1 + fail_msg: "IIAB currently DOES NOT SUPPORT multiple secondary gateways." + - name: Set exclude_devices if default gateway has been detected for {{ second_gateway_found.stdout }} set_fact: exclude_devices: "{{ second_gateway_found.stdout }}" From 99a05c6a78612039e95a272dc4d22dfb4e379203 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 3 Aug 2022 22:47:21 -0400 Subject: [PATCH 2/3] Clean up "multiple secondary gateways" error handling --- roles/network/tasks/detected_network.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 976e46987..899300d53 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -142,9 +142,10 @@ register: second_gateway_found changed_when: False -- assert: - that: second_gateway_found.stdout_lines | length == 1 - fail_msg: "IIAB currently DOES NOT SUPPORT multiple secondary gateways." +- name: Fail intentionally and explain, if multiple secondary gateways are detected + fail: + msg: "IIAB currently DOES NOT SUPPORT multiple secondary gateways: {{ second_gateway_found.stdout }}" + when: second_gateway_found.stdout_lines is defined and second_gateway_found.stdout_lines | length > 1 - name: Set exclude_devices if default gateway has been detected for {{ second_gateway_found.stdout }} set_fact: From 664dd5da5eb0c3d993a08875779fd73364a79c04 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 3 Aug 2022 23:00:43 -0400 Subject: [PATCH 3/3] Clarify "multiple secondary gateways" detection --- roles/network/tasks/detected_network.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 899300d53..e04ae0e20 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -142,7 +142,7 @@ register: second_gateway_found changed_when: False -- name: Fail intentionally and explain, if multiple secondary gateways are detected +- name: If multiple secondary gateways are detected, fail intentionally and explain fail: msg: "IIAB currently DOES NOT SUPPORT multiple secondary gateways: {{ second_gateway_found.stdout }}" when: second_gateway_found.stdout_lines is defined and second_gateway_found.stdout_lines | length > 1