diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
commit | 12f351d71b13feb4b808b15f6756fbf6a81de587 (patch) | |
tree | 8cd3ea02fb98cae19a6288b02abc508b728c8fc0 /roles/openshift_node | |
parent | 377405b67551ef51ce6f644bde018986465a1e0c (diff) | |
parent | c45c5935df97bb4aa9e8e9067d868371b04a24bf (diff) | |
download | openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.gz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.bz2 openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.xz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.zip |
Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansible
Diffstat (limited to 'roles/openshift_node')
-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 |