From 256fa58ca878b114595253d2701b24e54daa8689 Mon Sep 17 00:00:00 2001
From: Mike Graves <mgraves@redhat.com>
Date: Thu, 14 Oct 2021 08:39:16 -0400
Subject: [PATCH] Remove molecule dependencies (#261) (#263)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove molecule dependencies

SUMMARY

Depends-on: ansible-collections/cloud.common#92
Molecule is overwriting the cloud.common dependency installed by zuul,
which is causing issues with the CI job for turbo mode. We still need to
find a way to test against the latest released version of cloud.common.

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Gonéri Le Bouder <goneri@lebouder.net>
Reviewed-by: None <None>
(cherry picked from commit ff43353de6a5d24839bca1d44a9bdd0e6f618815)
---
 molecule/default/molecule.yml    |  4 ----
 molecule/default/tasks/drain.yml | 11 +++++++++++
 requirements.yml                 |  3 ---
 3 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 requirements.yml

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8b36c3fc..c037ff9c 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -33,7 +33,3 @@ scenario:
     - prepare
     - converge
     - verify
-dependency:
-  name: galaxy
-  options:
-    requirements-file: requirements.yml
diff --git a/molecule/default/tasks/drain.yml b/molecule/default/tasks/drain.yml
index 9da4defd..6bc2428b 100644
--- a/molecule/default/tasks/drain.yml
+++ b/molecule/default/tasks/drain.yml
@@ -11,6 +11,17 @@
       kind: Namespace
       name: '{{ drain_namespace }}'
 
+  # It seems that the default ServiceAccount can take a bit to be created
+  # right after a cluster is brought up. This can lead to the ServiceAccount
+  # admission controller rejecting a Pod creation request because the
+  # ServiceAccount does not yet exist.
+  - name: Wait for default serviceaccount to be created
+    k8s_info:
+      kind: ServiceAccount
+      name: default
+      namespace: "{{ drain_namespace }}"
+      wait: yes
+
   - name: list cluster nodes
     k8s_info:
       kind: node
diff --git a/requirements.yml b/requirements.yml
deleted file mode 100644
index 1c4b370d..00000000
--- a/requirements.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-collections:
-  - name: cloud.common
-    version: ">=2.0.4"