diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-01-07 16:41:37 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-01-07 16:44:05 -0500 |
| commit | 2fe86fee9758471fd55de2776bf512ddf2a39b8d (patch) | |
| tree | 0000a48218d238fd3ff539738ff919a23dc2d0af /roles/openshift_node/tasks | |
| parent | e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3 (diff) | |
| download | openshift-2fe86fee9758471fd55de2776bf512ddf2a39b8d.tar.gz openshift-2fe86fee9758471fd55de2776bf512ddf2a39b8d.tar.bz2 openshift-2fe86fee9758471fd55de2776bf512ddf2a39b8d.tar.xz openshift-2fe86fee9758471fd55de2776bf512ddf2a39b8d.zip | |
Always pull docker images
Diffstat (limited to 'roles/openshift_node/tasks')
| -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 |