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/tasks | |
| 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/tasks')
| -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 0133533fc..8b4931e7c 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 |