From cb668e6b4c40607c124ba95cf24e8dee12b02564 Mon Sep 17 00:00:00 2001
From: Andreas Karis <akaris@redhat.com>
Date: Wed, 28 Nov 2018 16:06:29 -0500
Subject: [PATCH] Optional ICMP validation of controllers and gateways

OpenStack Director uses ICMP packets during deployment to test
if overcloud nodes and the gateway are up. Make this validation
optional.

Closes-Bug: 1805703
Change-Id: I47835cae509f14c4ed51f4f6506a73070a125ca4
---
 all-nodes-validation.yaml       | 12 ++++++++++++
 validation-scripts/all-nodes.sh |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/all-nodes-validation.yaml b/all-nodes-validation.yaml
index c80b7d08ba..e4d9017a96 100644
--- a/all-nodes-validation.yaml
+++ b/all-nodes-validation.yaml
@@ -10,6 +10,14 @@ parameters:
     default: ''
     description: A string containing a space separated list of IP addresses used to ping test each available network interface.
     type: string
+  ValidateControllersIcmp:
+    default: true
+    description: Validation to ensure that all controllers can be reached with ICMP
+    type: boolean
+  ValidateGatewaysIcmp:
+    default: true
+    description: Validation to ensure that all gateways can be reached with ICMP
+    type: boolean
   ValidateFqdn:
     default: false
     description: Optional validation to ensure FQDN as set by Nova matches the name set in /etc/hosts.
@@ -31,6 +39,10 @@ resources:
           default: {get_param: ValidateFqdn}
         - name: validate_ntp
           default: {get_param: ValidateNtp}
+        - name: validate_controllers_icmp
+          default: {get_param: ValidateControllersIcmp}
+        - name: validate_gateways_icmp
+          default: {get_param: ValidateGatewaysIcmp}
       config: {get_file: ./validation-scripts/all-nodes.sh}
 
 outputs:
diff --git a/validation-scripts/all-nodes.sh b/validation-scripts/all-nodes.sh
index 256ca10fd8..2ab0a2b487 100755
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -125,8 +125,12 @@ function ntp_check() {
   fi
 }
 
-ping_default_gateways
-ping_controller_ips "$ping_test_ips"
+if [[ $validate_gateways_icmp == "True" ]];then
+  ping_default_gateways
+fi
+if [[ $validate_controllers_icmp == "True" ]];then
+  ping_controller_ips "$ping_test_ips"
+fi
 if [[ $validate_fqdn == "True" ]];then
   fqdn_check
 fi