summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-04 19:47:21 -0700
committerGitHub <noreply@github.com>2017-10-04 19:47:21 -0700
commitceac0382042f82efe1a8bf9e559d292fde3c215c (patch)
tree9062737874ba6eb318452ba1f7dbf3adacdcec87 /roles/docker
parentd4ea753bf99272c3b93bcdf420f9e1eee410050c (diff)
parent9bd849c32d87c8e92b9808087e7017934449ef64 (diff)
downloadopenshift-ceac0382042f82efe1a8bf9e559d292fde3c215c.tar.gz
openshift-ceac0382042f82efe1a8bf9e559d292fde3c215c.tar.bz2
openshift-ceac0382042f82efe1a8bf9e559d292fde3c215c.tar.xz
openshift-ceac0382042f82efe1a8bf9e559d292fde3c215c.zip
Merge pull request #5647 from mgugino-upstream-stage/docker-reg-auth-after-start
Automatic merge from submit-queue. Ensure docker service started prior to credentials Currently, authenticated registry credentials are requested before docker might be started in the docker role. This commit moves the relevant registry credential tasks to after docker is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/package_docker.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index a35335937..eab5c3bb1 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -137,18 +137,6 @@
notify:
- restart docker
-- name: Check for credentials file for registry auth
- stat:
- path: "{{ docker_cli_auth_config_path }}/config.json"
- when: oreg_auth_user is defined
- register: docker_cli_auth_credentials_stat
-
-- name: Create credentials for docker cli registry auth
- command: "docker --config={{ docker_cli_auth_config_path }} login -u {{ oreg_auth_user }} -p {{ oreg_auth_password }} {{ oreg_host }}"
- when:
- - oreg_auth_user is defined
- - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool
-
- name: Start the Docker service
systemd:
name: docker
@@ -163,4 +151,16 @@
- set_fact:
docker_service_status_changed: "{{ r_docker_package_docker_start_result | changed }}"
+- name: Check for credentials file for registry auth
+ stat:
+ path: "{{ docker_cli_auth_config_path }}/config.json"
+ when: oreg_auth_user is defined
+ register: docker_cli_auth_credentials_stat
+
+- name: Create credentials for docker cli registry auth
+ command: "docker --config={{ docker_cli_auth_config_path }} login -u {{ oreg_auth_user }} -p {{ oreg_auth_password }} {{ oreg_host }}"
+ when:
+ - oreg_auth_user is defined
+ - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool
+
- meta: flush_handlers