From 885e93575761f06a6678802bff4b648fb6c852d2 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 10 Jun 2020 12:10:47 +0200 Subject: [PATCH] osbs: just always pull fedora:latest Signed-off-by: Clement Verna --- inventory/group_vars/osbs | 4 ---- inventory/group_vars/osbs_stg | 4 ---- playbooks/groups/osbs/osbs-post-install.yml | 3 +-- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/inventory/group_vars/osbs b/inventory/group_vars/osbs index edc774bad6..09f05c378e 100644 --- a/inventory/group_vars/osbs +++ b/inventory/group_vars/osbs @@ -28,8 +28,4 @@ baseiptables: False openshift_required_images: - "openshift/origin-pod" -# fedora container images required by buildroot -fedora_required_images: - - "fedora:latest" - nm_controlled_resolv: True diff --git a/inventory/group_vars/osbs_stg b/inventory/group_vars/osbs_stg index 75dd0fc766..df1344af83 100644 --- a/inventory/group_vars/osbs_stg +++ b/inventory/group_vars/osbs_stg @@ -28,9 +28,5 @@ openshift_ansible_upgrading: True openshift_required_images: - "openshift/origin-pod" -# fedora container images required by buildroot -fedora_required_images: - - "fedora:latest" - nm_controlled_resolv: True diff --git a/playbooks/groups/osbs/osbs-post-install.yml b/playbooks/groups/osbs/osbs-post-install.yml index d290460bc1..f3ea739a02 100644 --- a/playbooks/groups/osbs/osbs-post-install.yml +++ b/playbooks/groups/osbs/osbs-post-install.yml @@ -187,8 +187,7 @@ when: etcosbs_kt_stat.stat.exists == false - name: pull fedora required docker images - command: "docker pull {{source_registry}}/{{item}}" - with_items: "{{fedora_required_images}}" + command: "docker pull fedora:latest" register: docker_pull_fedora changed_when: "'Downloaded newer image' in docker_pull_fedora.stdout"