From f2b3d91169111c44f47c994ae20cec352eee1450 Mon Sep 17 00:00:00 2001 From: Bernd Finger Date: Mon, 4 Mar 2024 15:31:06 +0100 Subject: [PATCH] sap_maintain_etc_hosts: Fix wrong assert messages also for absent hosts Relates to #662. Signed-off-by: Bernd Finger --- .../tasks/update_host_absent.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml b/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml index 135023b18..9155ba151 100644 --- a/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml +++ b/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml @@ -3,7 +3,11 @@ ansible.builtin.assert: that: thishost.node_ip | regex_search(sap_maintain_etc_hosts_regexp_ipv4) or thishost.node_ip | regex_search(sap_maintain_etc_hosts_regexp_ipv6) - msg: "Variable 'node_ip' is not an IP address. Please use the correct format" + msg: | + "The IP address of this host does not have a correct format. + Configure the IP address appropriately in of the following variables: + - sap_ip + - sap_maintain_etc_hosts_list, member node_ip" when: thisnode.node_ip is defined - name: Ensure that either IP address or hostname is defined @@ -13,7 +17,7 @@ ((thishost.node_ip is undefined) and (thishost.node_name is defined)) msg: "Invalid delete item. Please define either node_ip only or node_name. In the latter case node_domain is optional." -- name: Ensure that the entry all entries in hosts file are removed with IP {{ thishost.node_ip | d('undefined') }} +- name: Ensure that all entries with IP {{ thishost.node_ip | d('undefined') }} in /etc/hosts are absent ansible.builtin.lineinfile: path: "{{ __sap_maintain_etc_hosts_file }}" regexp: '^{{ thishost.node_ip }}\s' @@ -26,7 +30,7 @@ become_user: root become: true -- name: Ensure that the entry all entries in hosts file are removed with name {{ thishost.node_name | d('undefined') }} +- name: Ensure that all entries with name {{ thishost.node_name | d('undefined') }} in /etc/hosts are absent ansible.builtin.lineinfile: path: "{{ __sap_maintain_etc_hosts_file }}" regexp: '^.*\s{{ thishost.node_name }}\s' @@ -40,7 +44,7 @@ become_user: root become: true -- name: Ensure that the entry all enries in hosts file are removed with FQDN +- name: Ensure that all enries with the specified FQDN in /etc/hosts are absent ansible.builtin.lineinfile: path: "{{ __sap_maintain_etc_hosts_file }}" regexp: '^.*\s{{ thishost.node_name + "." + thishost.node_domain }}\s'