diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-07-27 09:51:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 09:51:09 +0200 |
| commit | 7a2eab51e45a7722f3eb51f96bd560e77725bc0b (patch) | |
| tree | 95e353f8c7ba90e56a8338487b00754b99bff8ae /roles/openshift_node_upgrade | |
| parent | 0c89e862e8b2759753e61f7ddd4f743c4013f6ee (diff) | |
| parent | 7fe9da4c0e4a5f16f69cacd6d21b848e620240c5 (diff) | |
| download | openshift-7a2eab51e45a7722f3eb51f96bd560e77725bc0b.tar.gz openshift-7a2eab51e45a7722f3eb51f96bd560e77725bc0b.tar.bz2 openshift-7a2eab51e45a7722f3eb51f96bd560e77725bc0b.tar.xz openshift-7a2eab51e45a7722f3eb51f96bd560e77725bc0b.zip | |
Merge pull request #4874 from ingvagabund/set-default-values
Sync all openshift.common.use_openshift_sdn uses in yaml files
Diffstat (limited to 'roles/openshift_node_upgrade')
| -rw-r--r-- | roles/openshift_node_upgrade/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/main.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_node_upgrade/handlers/main.yml b/roles/openshift_node_upgrade/handlers/main.yml index 110dfe5ce..f26f5d573 100644 --- a/roles/openshift_node_upgrade/handlers/main.yml +++ b/roles/openshift_node_upgrade/handlers/main.yml @@ -3,7 +3,10 @@ systemd: name: openvswitch state: restarted - when: (not skip_node_svc_handlers | default(False) | bool) and not (ovs_service_status_changed | default(false) | bool) and openshift.common.use_openshift_sdn | bool + when: + - not skip_node_svc_handlers | default(False) | bool + - not (ovs_service_status_changed | default(false) | bool) + - openshift.common.use_openshift_sdn | default(true) | bool register: l_openshift_node_upgrade_stop_openvswitch_result until: not l_openshift_node_upgrade_stop_openvswitch_result | failed retries: 3 diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml index ac9ea32cb..f984a04b2 100644 --- a/roles/openshift_node_upgrade/tasks/main.yml +++ b/roles/openshift_node_upgrade/tasks/main.yml @@ -43,7 +43,9 @@ 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 + when: + - openshift.common.is_containerized | bool + - openshift.common.use_openshift_sdn | default(true) | bool - include: docker/upgrade.yml vars: |