diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 12:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 12:13:10 -0400 |
| commit | d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (patch) | |
| tree | ca3493c5fa3cd56d98a48312148040d2e8b430d2 /roles/openshift_node | |
| parent | a355349a98cecec1d10e7d166aa70d8e77df20e1 (diff) | |
| parent | ca7767eab6674737a117a09f7f456b7918cffecf (diff) | |
| download | openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.gz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.bz2 openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.xz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.zip | |
Merge pull request #2168 from dgoodwin/container-cli-speed
Copy openshift binary instead of using wrapper script.
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 97a21544d..889541e25 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -41,11 +41,15 @@ - name: Pull node image command: > docker pull {{ openshift.node.node_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" when: openshift.common.is_containerized | bool - name: Pull OpenVSwitch image command: > docker pull {{ openshift.node.ovs_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool - name: Install the systemd units @@ -129,12 +133,12 @@ service: name={{ openshift.common.service_type }}-node enabled=yes state=started register: node_start_result ignore_errors: yes - + - name: Wait 30 seconds for docker initialization whenever node has failed pause: seconds: 30 when: node_start_result | failed - + - name: Start and enable node again service: name={{ openshift.common.service_type }}-node enabled=yes state=started register: node_start_result |