first fixes implemented

Author: Markus Koch

roles/update_etc_hosts/README.md

@@ -1,7 +1,7 @@
 Role Name
 =========
 
-This role can be used to reliably update teh /etc/hosts file
+This role can be used to reliably update the /etc/hosts file
 
 <!---
 Requirements
@@ -43,7 +43,7 @@ If you want to setup/add entries your etc hosts you can use this snippet
                   node_name: host2
                   state: absent
 ```
-If you have defined a cluster and the variable `sap_ha_pacemaker_cluster_cluster_nodes` or `sap_hana_cluster_nodes` is set, you can use the follwoing play:
+If you have defined a cluster and the variable `sap_ha_pacemaker_cluster_cluster_nodes` or `sap_hana_cluster_nodes` is set, you can use the following play:
 
 ```[yaml]
 - name: ensure all cluster nodes are in /etc/hosts

roles/update_etc_hosts/defaults/main.yml

@@ -4,4 +4,5 @@
 update_etc_hosts_list:
   - node_ip: "{{ ansible_default_ipv4.address }}"
     node_name: "{{ ansible_hostname }}"
+    node_comment: "managed by ansible update_etc_hosts role"
     state: present

roles/update_etc_hosts/handlers/main.yml

@@ -16,20 +16,23 @@ argument_specs:
         elements: dict
         options:
           node_ip:
+            type: str
             description:
               - IP address of the node
           node_name:
+            type: str
             description:
               - Hostname of the node
           node_domain:
+            type: str
             description:
               - Domainname of the node
-              - _Optional. Defaults to sap_domain_
+              - _Optional. Defaults to sap_domain_, if set, then ansible_domain
           aliases:
             type: list
+            elements: str
             description:
               - List of hostname aliases
-            elements: str
           alias_mode:
             type: str
             default: merge
@@ -39,7 +42,12 @@ argument_specs:
             description:
               - merges or overwrites the aliases
           node_comment:
+            type: str
+            default: "managed by ansible update_etc_hosts role"
             description: String which is appended to line in hosts after comment string
+          hana_site:
+            type: str
+            description: if set (e.g. for configuring cluster) it is appended to the comment
           state:
             type: str
             default: present

roles/update_etc_hosts/meta/argument_specs.yml

@@ -29,15 +29,15 @@
 
 - name: Set default values
   ansible.builtin.set_fact:
-    __update_etc_hosts_comment: "{{ ( thishost.node_comment|d('') + ' ' + thishost.hana_site|d('') ) | trim }}"
+    __update_etc_hosts_comment: "{{ (thishost.node_comment | d('') + ' ' + thishost.hana_site | d('')) | trim }}"
     __update_etc_hosts_alias_mode: "{{ thishost.alias_mode | default('merge') }}"
 
 - name: Prepend Hashtag to comment
   when: __update_etc_hosts_comment|length > 0
   ansible.builtin.set_fact:
     __update_etc_hosts_comment: "# {{ __update_etc_hosts_comment }}"
 
-- name: merge existing aliases with new alis list
+- name: Merge existing aliases with new alis list
   when: __update_etc_hosts_alias_mode != "overwrite"
   block:
     - name: Get all existing hostname aliases of {{ thishost.node_ip }}
@@ -52,12 +52,12 @@
       changed_when: false
     - name: Add defined aliases
       ansible.builtin.set_fact:
-        __update_etc_hosts_aliases: "{{ (__update_etc_hosts_register_aliases.stdout.split(' ') + thishost.aliases|d([]))|unique|join(' ') }}"
+        __update_etc_hosts_aliases: "{{ (__update_etc_hosts_register_aliases.stdout.split(' ') + thishost.aliases | d([])) | unique | join(' ') }}"
 
 - name: Overwrite existing aliases
   when: __update_etc_hosts_alias_mode == "overwrite"
   ansible.builtin.set_fact:
-    __update_etc_hosts_aliases: "{{ thishost.node_aliases|d([])|unique|join(' ') }}"
+    __update_etc_hosts_aliases: "{{ thishost.node_aliases | d([]) | unique | join(' ') }}"
 
 - name: Display host and domain name, and IP address before the modification
   ansible.builtin.debug:
@@ -90,7 +90,7 @@
       - "More than one line containing {{ thishost.node_ip }}. File {{ __update_etc_hosts_file }} will not be modified."
   when:
     - not ansible_check_mode
-    - __update_etc_hosts_register_duplicate_ip_check.stdout == 'Duplicate IP entry in {{ __update_etc_hosts_file }}!'
+    - __update_etc_hosts_register_duplicate_ip_check.rc == 1
 
 - name: Ensure that the entry in hosts file is correct
   ansible.builtin.lineinfile:
@@ -100,7 +100,7 @@
     backup: true
   when:
     - not ansible_check_mode
-    - __update_etc_hosts_register_duplicate_ip_check.stdout != 'Duplicate IP entry in {{ __update_etc_hosts_file }}!'
+    - __update_etc_hosts_register_duplicate_ip_check.rc == 0
 
 - name: Check for duplicate or missing entries of hostname and fqdn in {{ __update_etc_hosts_file }}
   ansible.builtin.shell: |