From 326c244f8c1d4703dac97b8578c629e619452be1 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 23 Mar 2023 11:51:10 -0700
Subject: [PATCH] Add ensure-* roles to container image jobs

This is in the zuul-jobs pre-playbook, but we don't actually inherit
from those jobs so we need to duplicate it.

Change-Id: I875df74936736b80dbb2f29bbb474b993f4616ea
---
 playbooks/container-image/pre.yaml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/playbooks/container-image/pre.yaml b/playbooks/container-image/pre.yaml
index 4d952ed..90873a4 100644
--- a/playbooks/container-image/pre.yaml
+++ b/playbooks/container-image/pre.yaml
@@ -1,3 +1,13 @@
-- hosts: localhost
-  roles:
-    - pull-from-intermediate-registry
+- hosts: all
+  tasks:
+    - name: Ensure docker is installed
+      when: "container_command == 'docker'"
+      include_role:
+        name: ensure-docker
+    - name: Ensure podman is installed
+      when: "container_command != 'docker'"
+      include_role:
+        name: ensure-podman
+    - name: Pull from intermediate registry
+      include_role:
+        name: pull-from-intermediate-registry