summaryrefslogtreecommitdiffstats
path: root/roles/container_runtime
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-09 12:20:55 -0800
committerGitHub <noreply@github.com>2018-01-09 12:20:55 -0800
commit77730cb7f2e04175c72759f627186a5efffcc3c1 (patch)
tree88012b69e6871a56c36cb3caa0415c053201ad64 /roles/container_runtime
parent25f31c4c472807ad504abcba41a423895e9838d7 (diff)
parent065584c1d0b653012d0a32a3410211c3fc362ec7 (diff)
downloadopenshift-77730cb7f2e04175c72759f627186a5efffcc3c1.tar.gz
openshift-77730cb7f2e04175c72759f627186a5efffcc3c1.tar.bz2
openshift-77730cb7f2e04175c72759f627186a5efffcc3c1.tar.xz
openshift-77730cb7f2e04175c72759f627186a5efffcc3c1.zip
Merge pull request #6646 from giuseppe/fix-container-engine-auth
Automatic merge from submit-queue. 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>
Diffstat (limited to 'roles/container_runtime')
-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 }}"