summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-18 15:53:31 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-20 12:58:42 -0300
commit3a71ccde5c1a0324648516f761515c09bc461be3 (patch)
tree5820554aee18c68104eefdb7524b41d7a2c8aa2b /roles/openshift_node
parentac4ef6bb65c24890592b6b35b11be82f4ddc6deb (diff)
downloadopenshift-3a71ccde5c1a0324648516f761515c09bc461be3.tar.gz
openshift-3a71ccde5c1a0324648516f761515c09bc461be3.tar.bz2
openshift-3a71ccde5c1a0324648516f761515c09bc461be3.tar.xz
openshift-3a71ccde5c1a0324648516f761515c09bc461be3.zip
Stop reporting changes when docker pull is already up to date.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml8
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