From 2c298e23170f5fcf3427150cc3f2d68373b2fdd9 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 29 Jan 2021 07:26:03 -0700
Subject: [PATCH] Split network validation to it's own play

When we moved the network deployment to free, we can hit a race
condition where some nodes are being configured prior to the controllers
being ready. This can lead to the basic network validation failing.  We
can deal with this by moving the validation to it's own play so that we
ensure all network configurations have occurred prior to to checking
that nodes can ping the controllers.

Change-Id: I48665379a87e701633be1bcc90bd8be1cc75c513
Closes-Bug: #1913725
(cherry picked from commit 64e735898b8fae7643fc092fed840d867a252046)
---
 common/deploy-steps.j2 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 67c4a32ef8..3e906f717d 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -563,7 +563,18 @@ outputs:
                     tripleo_network_config_async_poll: "{{ async_poll | default(3) }}"
                   when:
                     - NetworkConfig_stat.stat.exists
+              tags:
+                - overcloud
+                - pre_deploy_steps
+{% endraw %}
 
+            - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
+              strategy: tripleo_free
+              name: Server deployments
+              gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
+              any_errors_fatal: yes
+              tasks:
+{% raw %}
                 - name: Basic Network Validation
                   include_role:
                     name: tripleo_nodes_validation