Merge branch 'dev' into issue-662

berndfinger · Mar 4, 2024 · ee67845 · ee67845
2 parents 5ec64dd + da5312f
commit ee67845
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/roles/sap_maintain_etc_hosts/defaults/main.yml b/roles/sap_maintain_etc_hosts/defaults/main.yml
@@ -45,3 +45,7 @@
 # the role creates a default value from ansible_facts
 
 sap_maintain_etc_hosts_list: "{{ sap_hana_cluster_nodes | default(sap_ha_pacemaker_cluster_cluster_nodes) | default(omit) }}"
+
+# regex patterns for IP address validation:
+sap_maintain_etc_hosts_regexp_ipv4: '^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$'
+sap_maintain_etc_hosts_regexp_ipv6: '^(?:[a-fA-F0-9]{0,4}:){7}[a-fA-F0-9]{0,4}$'
diff --git a/roles/sap_maintain_etc_hosts/meta/argument_specs.yml b/roles/sap_maintain_etc_hosts/meta/argument_specs.yml
@@ -82,3 +82,15 @@ argument_specs:
               state: absent
             - node_name: host2
               state: absent
+
+      sap_maintain_etc_hosts_regexp_ipv4:
+        default: '^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$'
+        description:
+          - regex pattern for IPv4 address validation
+        type: str
+
+      sap_maintain_etc_hosts_regexp_ipv6:
+        default: '^(?:[a-fA-F0-9]{0,4}:){7}[a-fA-F0-9]{0,4}$'
+        description:
+          - regex pattern for IPv6 address validation
+        type: str
diff --git a/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml b/roles/sap_maintain_etc_hosts/tasks/update_host_absent.yml
@@ -1,7 +1,8 @@
 ---
 - name: Verify that variable node_ip is in the correct format
   ansible.builtin.assert:
-    that: thishost.node_ip is ansible.utils.ip
+    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"
   when: thisnode.node_ip is defined
 

diff --git a/roles/sap_maintain_etc_hosts/tasks/update_host_present.yml b/roles/sap_maintain_etc_hosts/tasks/update_host_present.yml
@@ -10,7 +10,8 @@
 
 - name: Verify that variable node_ip is using the correct IP address format
   ansible.builtin.assert:
-    that: thishost.node_ip is ansible.utils.ip
+    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: |
       "The IP address of this host does not have a correct format.
        Configure the IP address appropriately in of the following variables: