From 2a7131b9403a4b22ebc55606814f604f723dc826 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 13 Oct 2015 16:36:01 +0200 Subject: Add flannel support Signed-off-by: Sylvain Baubeau --- roles/openshift_common/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_common/tasks/main.yml') diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 73bd28630..64afc5081 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -13,6 +13,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 }} -- cgit v1.2.3 From 68e09d87fd859d8ec41b5eef5c44b4b39e732ba2 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Thu, 15 Oct 2015 10:38:59 +0200 Subject: Ensure openshift-sdn and flannel can't be used at the same time --- roles/openshift_common/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'roles/openshift_common/tasks/main.yml') diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 64afc5081..fcc23a4f4 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 | bool and openshift_use_flannel | bool + - name: Set common Cluster facts openshift_facts: role: common -- cgit v1.2.3 From 7e552e7ce4b6bd7dbd99a8fcaf1a6de87f8c8bee Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 27 Oct 2015 16:14:02 +0100 Subject: Fix when neither use_openshift_sdn nor use_flannel are specified --- roles/openshift_common/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_common/tasks/main.yml') diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index fcc23a4f4..38d5a08e4 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -1,7 +1,7 @@ --- - fail: msg: Flannel can not be used with openshift sdn - when: openshift_use_openshift_sdn | bool and openshift_use_flannel | bool + when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_flannel | default(false) | bool - name: Set common Cluster facts openshift_facts: -- cgit v1.2.3