diff --git a/all-nodes-validation.yaml b/all-nodes-validation.yaml
index f736f22662..586cd227dc 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 d099587f6b..4a0187b914 100644
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -110,8 +110,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