summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-01-08 11:39:33 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-01-08 11:39:57 +0100
commit065584c1d0b653012d0a32a3410211c3fc362ec7 (patch)
treeb70146e33c114a957978c0cdb2cd8f9ffcb3d2b2
parent01e57abee227d3d12bdd4d65cd2b7ad510ed1f22 (diff)
downloadopenshift-065584c1d0b653012d0a32a3410211c3fc362ec7.tar.gz
openshift-065584c1d0b653012d0a32a3410211c3fc362ec7.tar.bz2
openshift-065584c1d0b653012d0a32a3410211c3fc362ec7.tar.xz
openshift-065584c1d0b653012d0a32a3410211c3fc362ec7.zip
container-engine: move registry_auth.yml before pull
so that the atomic pull takes into account the credentials if required. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/container_runtime/tasks/systemcontainer_docker.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/container_runtime/tasks/systemcontainer_docker.yml b/roles/container_runtime/tasks/systemcontainer_docker.yml
index dc0452553..5f715cd21 100644
--- a/roles/container_runtime/tasks/systemcontainer_docker.yml
+++ b/roles/container_runtime/tasks/systemcontainer_docker.yml
@@ -42,6 +42,12 @@
- debug:
var: l_docker_image
+# Do the authentication before pulling the container engine system container
+# as the pull might be from an authenticated registry.
+- include_tasks: registry_auth.yml
+ vars:
+ openshift_docker_alternative_creds: True
+
# NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released
- name: Pre-pull Container Engine System Container image
command: "atomic pull --storage ostree {{ l_docker_image }}"