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/tasks/main.yml | |
| 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/tasks/main.yml')
| -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 879f6c207..fff98aa53 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -90,7 +90,9 @@ package: name: "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version | oo_image_tag_to_rpm_version(include_dash=True) }}" state: present - when: openshift.common.use_openshift_sdn and not openshift.common.is_containerized | bool + when: + - openshift.common.use_openshift_sdn | default(true) | bool + - not openshift.common.is_containerized | bool - name: Install conntrack-tools package package: @@ -119,7 +121,9 @@ enabled: yes state: started daemon_reload: yes - 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 register: ovs_start_result until: not ovs_start_result | failed retries: 3 |