diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-09 15:54:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 15:54:24 -0400 |
| commit | 6498187103bd951304ce8112b927d430347513e0 (patch) | |
| tree | da011100ff9ed6f868f18b2df5cf19f8014744b0 /roles/openshift_master | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| parent | e272847e1a195d8ca74103fd87c7207b68c0d919 (diff) | |
| download | openshift-6498187103bd951304ce8112b927d430347513e0.tar.gz openshift-6498187103bd951304ce8112b927d430347513e0.tar.bz2 openshift-6498187103bd951304ce8112b927d430347513e0.tar.xz openshift-6498187103bd951304ce8112b927d430347513e0.zip | |
Merge pull request #2005 from brenton/bz1338726
Bug 1338726 - never abort install if the latest version of docker is already installed
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 52ea8bccf..28faee155 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -29,7 +29,7 @@ - name: Pull master image command: > - docker pull {{ openshift.master.master_image }}:{{ openshift_version }} + docker pull {{ openshift.master.master_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} when: openshift.common.is_containerized | bool - name: Create openshift.common.data_dir |