diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 4823b22177..51a712938b 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -677,8 +677,8 @@ outputs:
                     tripleo_nodes_validation_validate_controllers_icmp: "{{ validate_controllers_icmp }}"
                     tripleo_nodes_validation_validate_gateway_icmp: "{{ validate_gateways_icmp }}"
                     tripleo_nodes_validation_validate_fqdn: "{{ validate_fqdn }}"
-                    tripleo_nodes_validation_ping_test_ips: "{{ ping_test_ips.get(tripleo_role_name).split(' ') | list | unique }}"
-                    tripleo_nodes_validation_ping_test_gateway_ips: "{{ ping_test_gateway_ips.get(tripleo_role_name) }}"
+                    tripleo_nodes_validation_ping_test_ips: "{{ ping_test_ips.get(tripleo_role_name, '').split() | list | unique }}"
+                    tripleo_nodes_validation_ping_test_gateway_ips: "{{ ping_test_gateway_ips.get(tripleo_role_name, []) }}"
               tags:
                 - overcloud
                 - pre_deploy_steps