diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-12 10:42:39 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-11-12 10:42:39 -0500 |
| commit | 5ed42612965d72b87638ebe2fa96bec89199c4fa (patch) | |
| tree | c58b76b1a9b42ee4adba2a07d5917e519fef9691 /roles/openshift_common | |
| parent | 7869fb8c26a96c1e0ee74b930fd0da8a9952cb52 (diff) | |
| parent | 597ba24415d6b7faa7ca02d200c8aed3c08b925a (diff) | |
| download | openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.gz openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.bz2 openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.xz openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.zip | |
Merge pull request #878 from openshift/master
Master to prod
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 73bd28630..38d5a08e4 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -1,4 +1,8 @@ --- +- fail: + msg: Flannel can not be used with openshift sdn + when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_flannel | default(false) | bool + - name: Set common Cluster facts openshift_facts: role: common @@ -13,6 +17,7 @@ sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}" deployment_type: "{{ openshift_deployment_type }}" use_fluentd: "{{ openshift_use_fluentd | default(None) }}" + use_flannel: "{{ openshift_use_flannel | default(None) }}" - name: Set hostname hostname: name={{ openshift.common.hostname }} |