diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-04 19:47:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 19:47:21 -0700 |
| commit | ceac0382042f82efe1a8bf9e559d292fde3c215c (patch) | |
| tree | 9062737874ba6eb318452ba1f7dbf3adacdcec87 /roles/etcd/templates/custom.conf.j2 | |
| parent | d4ea753bf99272c3b93bcdf420f9e1eee410050c (diff) | |
| parent | 9bd849c32d87c8e92b9808087e7017934449ef64 (diff) | |
| download | openshift-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/etcd/templates/custom.conf.j2')
0 files changed, 0 insertions, 0 deletions