diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-07-26 16:10:47 +0200 |
|---|---|---|
| committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-07-26 19:11:58 +0200 |
| commit | 7fe9da4c0e4a5f16f69cacd6d21b848e620240c5 (patch) | |
| tree | 38fb5aa204c47078ba8c8ab499e2995e8544f59f /roles/openshift_node_upgrade | |
| parent | 0c350dcc7d06d62be5ba3a8e468dff85cdd96dd7 (diff) | |
| download | openshift-7fe9da4c0e4a5f16f69cacd6d21b848e620240c5.tar.gz openshift-7fe9da4c0e4a5f16f69cacd6d21b848e620240c5.tar.bz2 openshift-7fe9da4c0e4a5f16f69cacd6d21b848e620240c5.tar.xz openshift-7fe9da4c0e4a5f16f69cacd6d21b848e620240c5.zip | |
Sync all openshift.common.use_openshift_sdn uses in yaml files
Most occurrences are in a form:
```yaml
openshift.common.use_openshift_sdn | default(true) | bool
```
Let's make all occurences this way given the use_openshift_sdn is set to true anyway.
See https://github.com/openshift/openshift-ansible/blob/0c350dcc7d06d62be5ba3a8e468dff85cdd96dd7/roles/openshift_facts/library/openshift_facts.py#L2035
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: |