From 7d937d2a544ee4be381075d2b7c6b1f7ac896ed2 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 23 Apr 2021 15:48:48 +0100
Subject: [PATCH] Ensure we use stream8 images instead of old centos8 ones.

Change-Id: I55358c881fc779245877733d7dccba80c95ffd19
---
 .../roles/tripleo_container_image_build/defaults/main.yml   | 2 +-
 .../tripleo_container_tag/molecule/default/converge.yml     | 4 ++--
 .../tripleo_container_tag/molecule/legacy_vars/converge.yml | 4 ++--
 .../roles/tripleo_ovs_dpdk/molecule/default/molecule.yml    | 4 ++--
 .../roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml   | 4 ++--
 .../molecule/default/molecule.yml                           | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tripleo_ansible/roles/tripleo_container_image_build/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_image_build/defaults/main.yml
index 108bb5c9c..6e1f786ef 100644
--- a/tripleo_ansible/roles/tripleo_container_image_build/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo_container_image_build/defaults/main.yml
@@ -22,7 +22,7 @@ tcib_path: "{{ lookup('env', 'HOME') }}"
 tcib_args: {}
 
 # String, required, 'item', implements https://docs.docker.com/engine/reference/builder/#from
-tcib_from: "centos:8"
+tcib_from: "quay.io/centos/centos:stream8"
 
 # Dictionary, single level key:value pairs, optional, implements https://docs.docker.com/engine/reference/builder/#label
 tcib_labels: {}
diff --git a/tripleo_ansible/roles/tripleo_container_tag/molecule/default/converge.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/converge.yml
index 05fc6ee16..e8d944b35 100644
--- a/tripleo_ansible/roles/tripleo_container_tag/molecule/default/converge.yml
+++ b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/converge.yml
@@ -20,11 +20,11 @@
   become: true
   roles:
     - role: "tripleo_container_tag"
-      tripleo_container_image: centos:8
+      tripleo_container_image: quay.io/centos/centos:stream8
       tripleo_container_image_latest: test-latest
       tripleo_container_cli: podman
     - role: "tripleo_container_tag"
-      tripleo_container_image: centos:8
+      tripleo_container_image: quay.io/centos/centos:stream8
       tripleo_container_image_latest: test-latest-2
       tripleo_container_cli: podman
       tripleo_container_pull_image: false
diff --git a/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/converge.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/converge.yml
index a0fd56c8b..d2f7813e7 100644
--- a/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/converge.yml
+++ b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/converge.yml
@@ -20,11 +20,11 @@
   become: true
   roles:
     - role: "tripleo_container_tag"
-      container_image: centos:8
+      container_image: quay.io/centos/centos:stream8
       container_image_latest: test-latest
       container_cli: podman
     - role: "tripleo_container_tag"
-      container_image: centos:8
+      container_image: quay.io/centos/centos:stream8
       container_image_latest: test-latest-2
       container_cli: podman
       container_pull_image: false
diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml
index 58d326824..a2108bcce 100644
--- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml
@@ -6,8 +6,8 @@ log: true
 
 platforms:
 
-  - name: centos8
-    hostname: centos8
+  - name: stream8
+    hostname: stream8
     image: quay.io/centos/centos:stream8
     dockerfile: Dockerfile
     pkg_extras: python*-setuptools
diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml
index b559d9901..9e94fb672 100644
--- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml
@@ -5,8 +5,8 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
+  - name: stream8
+    hostname: stream8
     image: quay.io/centos/centos:stream8
     dockerfile: Dockerfile
     pkg_extras: python*-setuptools
diff --git a/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml
index f905e671c..80776b911 100644
--- a/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml
@@ -22,9 +22,9 @@ platforms:
     ulimits: &ulimit
       - host
 
-  - name: centos8
-    hostname: centos8
-    image: centos:8
+  - name: stream8
+    hostname: stream8
+    image: quay.io/centos/centos:stream8
     dockerfile: Dockerfile
     pkg_extras: python*-setuptools cronie rsyslog
     environment: