From ddde8e573e626e6a0dd9ed77c6ffd97f86c6a924 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Sun, 12 Jul 2020 21:49:04 +0000
Subject: [PATCH] Revert "Make the metalsmith module interactions more
 resilient"

This reverts commit 476d0e3bef4ce15d586a7e8fa21e1e0643f87f4c.

It looks like this change is masking the root cause of bug #1879472, it
is probably not appropriate to do a retry on a whole
metalsmith_instances call, it would be better to do retries on
individual API calls and handle failures of instance provisioning on
an instance-by-instance basis inside the module.

Change-Id: If6814de77c110b622bd4e5b6430d65fce7dd19ff
Related-Bug: #1879472
---
 tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml | 6 ------
 .../playbooks/cli-overcloud-node-unprovision.yaml           | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml
index 3bd879880..925847318 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml
@@ -101,9 +101,6 @@
         state: reserved
         clean_up: true
       register: baremetal_reserved
-      until: baremetal_reserved is success
-      retries: 3
-      delay: 2
 
     # NOTE(cloudnull): This limits the concurrency so that we're not adding
     #                  more threads than needed.
@@ -123,9 +120,6 @@
         timeout: "{{ node_timeout }}"
         concurrency: "{{ runtime_concurrency }}"
       register: baremetal_provisioned
-      until: baremetal_provisioned is success
-      retries: 3
-      delay: 2
 
     - name: Populate environment
       tripleo_baremetal_populate_environment:
diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
index 0b3946786..c9d9006cb 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
@@ -79,7 +79,3 @@
         instances: "{{ baremetal_existing.instances }}"
         state: absent
       when: not prompt|bool
-      register: baremetal_unprovisioned
-      until: baremetal_unprovisioned is success
-      retries: 3
-      delay: 2