From ede3aad2abe70b3121f3b6b878098ff9018b5c90 Mon Sep 17 00:00:00 2001 From: Smana Date: Fri, 4 Mar 2016 11:25:01 +0100 Subject: [PATCH] flannel backend type option --- README.md | 2 ++ roles/network_plugin/flannel/defaults/main.yml | 4 ++++ roles/network_plugin/flannel/templates/network.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ffb4d36a..b8ce8f6ac 100644 --- a/README.md +++ b/README.md @@ -283,6 +283,8 @@ node1 ansible_ssh_host=95.54.0.12 local_as=xxxxxx #### Flannel +You can choose the [backend](https://github.com/coreos/flannel/blob/master/README.md) type by changing the variable **flannel_backend_type** (default: vxlan) + * Flannel configuration file should have been created there ``` cat /run/flannel/subnet.env diff --git a/roles/network_plugin/flannel/defaults/main.yml b/roles/network_plugin/flannel/defaults/main.yml index 42ce76535..ce00090ec 100644 --- a/roles/network_plugin/flannel/defaults/main.yml +++ b/roles/network_plugin/flannel/defaults/main.yml @@ -6,3 +6,7 @@ flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address ## interface that should be used for flannel operations ## This is actually an inventory node-level item # flannel_interface: + +# You can choose what type of flannel backend to use +# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md +flannel_backend_type: "vxlan" diff --git a/roles/network_plugin/flannel/templates/network.json b/roles/network_plugin/flannel/templates/network.json index 8f28ff15d..cbbec3841 100644 --- a/roles/network_plugin/flannel/templates/network.json +++ b/roles/network_plugin/flannel/templates/network.json @@ -1 +1 @@ -{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "vxlan" } } +{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "{{ flannel_backend_type }}" } }