commit a0a308a0872ad9cc3477e174bc6e66ee9e6d09d0
author Jedrzej Nowak <jnowak@mirantis.com> Wed Apr 18 11:17:10 2018 +0000
committer Gerrit Code Review <gerrit2@49259fdfccf8> Wed Apr 18 11:17:11 2018 +0000
tree 0529efe9c77925f17cef1df32beace5fe7b56fe7
parent 6a895cfa688ba56280a733f8262b0f8e8604312c
parent 0fd37458b50212f4dfe8c841ab210f341cc861c2

Merge "Allow to configure flanneld options."

kubernetes/files/kube-addons/flannel/flannel.yml

diff --git a/kubernetes/files/kube-addons/flannel/flannel.yml b/kubernetes/files/kube-addons/flannel/flannel.yml
index 58d0217..f06618b 100644
--- a/kubernetes/files/kube-addons/flannel/flannel.yml
+++ b/kubernetes/files/kube-addons/flannel/flannel.yml
@@ -101,6 +101,9 @@
         args:
         - --ip-masq
         - --kube-subnet-mgr
+        {%- for option, value in master.network.flannel.flanneld_options.items() %}
+        - --{{ option }}={{ value }}
+        {%- endfor %}
         resources:
           requests:
             cpu: "100m"