diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 13:49:32 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 13:49:32 -0500 |
| commit | 6d2e202d514784df66b4f663ae725da7ef4499ae (patch) | |
| tree | 8e6d6287ce843d4f74ecc8e5db0b3e9da9326654 /roles/openshift_node | |
| parent | 7c48bcc8a708828ff78a4b239eca6cf60531f5e2 (diff) | |
| parent | 8be4562550db9285039738173607cce446979190 (diff) | |
| download | openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.gz openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.bz2 openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.xz openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.zip | |
Merge pull request #1097 from sdodson/containers
Always pull images
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 33852d7f8..0828d8e2c 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -44,41 +44,14 @@ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present" when: openshift.common.use_openshift_sdn and not openshift.common.is_containerized | bool -- name: Get docker images - command: docker images - changed_when: false - when: openshift.common.is_containerized | bool - register: docker_images - - name: Pull node image command: > docker pull {{ openshift.node.node_image }} - when: openshift.common.is_containerized | bool and openshift.node.node_image not in docker_images.stdout - -- name: Wait for node image - command: > - docker images - register: docker_images - until: openshift.node.node_image in docker_images.stdout - retries: 30 - delay: 10 - changed_when: false when: openshift.common.is_containerized | bool - + - name: Pull OpenVSwitch image command: > docker pull {{ openshift.node.ovs_image }} - when: openshift.common.is_containerized | bool and openshift.node.ovs_image not in docker_images.stdout - and openshift.common.use_openshift_sdn | bool - -- name: Wait for OpenVSwitch image - command: > - docker images - register: docker_images - until: openshift.node.ovs_image in docker_images.stdout - retries: 30 - delay: 10 - changed_when: false when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool - name: Install Node docker service file |