summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-14 22:46:08 -0800
committerGitHub <noreply@github.com>2017-11-14 22:46:08 -0800
commit32493153d4c5714ff3c5a04e2497be8f92cba4de (patch)
tree1f6cab0367caf6a7963c2075c977de0638f859dc
parentec564267f4a25036c92a71be481cfd9e4c03537a (diff)
parent68b66faed0a5fc4364e50daa5e4a9a1b42a12734 (diff)
downloadopenshift-32493153d4c5714ff3c5a04e2497be8f92cba4de.tar.gz
openshift-32493153d4c5714ff3c5a04e2497be8f92cba4de.tar.bz2
openshift-32493153d4c5714ff3c5a04e2497be8f92cba4de.tar.xz
openshift-32493153d4c5714ff3c5a04e2497be8f92cba4de.zip
Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxy
Automatic merge from submit-queue. Run registry auth after docker restart Currently, docker login may fail if a proxy is added to the config but docker is already running. This is due to the fact that 'docker login' must have a functioning docker.service running (with valid network connection) to complete. Currently, handlers restart the docker service at the end of the role. This doesn't allow for updating proxy settings before running docker login. This commit moves 'docker login' command after flushing handlers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511869
-rw-r--r--roles/docker/tasks/package_docker.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index c1aedf879..8121163a6 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -154,6 +154,7 @@
- set_fact:
docker_service_status_changed: "{{ (r_docker_package_docker_start_result | changed) and (r_docker_already_running_result.stdout != 'ActiveState=active' ) }}"
-- include: registry_auth.yml
-
- meta: flush_handlers
+
+# This needs to run after docker is restarted to account for proxy settings.
+- include: registry_auth.yml