diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-23 10:47:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 10:47:35 -0700 |
| commit | be7d536260d562e3fff6d6ebf762f6bc2e4e9879 (patch) | |
| tree | c9e2128bdc3148c4d2dcc0d78b28a2c6d2f7f3c6 /roles/flannel/defaults | |
| parent | a20098d3ae28110dd4d38ed4aa3a89af6cb72a01 (diff) | |
| parent | f7b290de4186f00dd51e41dfb7e9f5eb42174099 (diff) | |
| download | openshift-be7d536260d562e3fff6d6ebf762f6bc2e4e9879.tar.gz openshift-be7d536260d562e3fff6d6ebf762f6bc2e4e9879.tar.bz2 openshift-be7d536260d562e3fff6d6ebf762f6bc2e4e9879.tar.xz openshift-be7d536260d562e3fff6d6ebf762f6bc2e4e9879.zip | |
Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-available
Automatic merge from submit-queue.
cli: do not pull again the image when using Docker
When CRI-O is used and the CLI image is already pulled into Docker
then use it also for copying the CLI files to the host instead of
pulling it once again in the ostree storage.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/flannel/defaults')
0 files changed, 0 insertions, 0 deletions