diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 14:58:02 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 14:58:02 -0300 |
| commit | c45c5935df97bb4aa9e8e9067d868371b04a24bf (patch) | |
| tree | 3c6a60f1b615b6a2adab5d315655de95e90ada4f /roles/openshift_node/tasks | |
| parent | 0c31d72be3bf32f848eedad9859a81ba858f8c8f (diff) | |
| download | openshift-c45c5935df97bb4aa9e8e9067d868371b04a24bf.tar.gz openshift-c45c5935df97bb4aa9e8e9067d868371b04a24bf.tar.bz2 openshift-c45c5935df97bb4aa9e8e9067d868371b04a24bf.tar.xz openshift-c45c5935df97bb4aa9e8e9067d868371b04a24bf.zip | |
Fix Docker 1.10 problems with empty tags and trailing :
Docker 1.10 is no longer tolerant of commands like "docker pull
myimage:" when we do not have an image tag in play.
Adjust all occurrences with one that only includes the : if a version is
defined.
Adjust the containerized CLI wrappers for a similar problem.
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e8bd13855..657e99e87 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -39,12 +39,12 @@ - name: Pull node image command: > - docker pull {{ openshift.node.node_image }}:{{ openshift_version }} + docker pull {{ openshift.node.node_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} when: openshift.common.is_containerized | bool - name: Pull OpenVSwitch image command: > - docker pull {{ openshift.node.ovs_image }}:{{ openshift_version }} + docker pull {{ openshift.node.ovs_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool - name: Install the systemd units |