commit 6bcddaf7edf5925d423db28162db5a016b92b520
author Andrey Shestakov <ashestakov@mirantis.com> Mon Aug 06 00:05:13 2018 +0300
committer Andrey Shestakov <ashestakov@mirantis.com> Mon Aug 06 00:05:13 2018 +0300
tree 175ad87e122a5ce631a5dded6f26dd0d5a23116d
parent 1e5b9d862d86fa039bf8f25de56033b7b9ec56e4

Fix k8s flannel enable flag

Change-Id: I5ba47a14e445f7bedb78735e48f578a28aa5e0e6

kubernetes/common.yml

diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index ddf6973..2dbccc4 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -97,7 +97,6 @@
           enabled: ${_param:kubernetes_contrail_network_controller_enabled}
           image: ${_param:kubernetes_contrail_network_controller_image}
         flannel:
-          enabled: ${_param:kubernetes_flannel_enabled}
           image: ${_param:kubernetes_flannel_image}
         virtlet:
           enabled: ${_param:kubernetes_virtlet_enabled}
@@ -129,3 +128,5 @@
           enabled: ${_param:kubernetes_sriov_enabled}
           source: ${_param:kubernetes_sriov_source}
           source_hash: ${_param:kubernetes_sriov_source_hash}
+        flannel:
+          enabled: ${_param:kubernetes_flannel_enabled}

kubernetes/master/common.yml

diff --git a/kubernetes/master/common.yml b/kubernetes/master/common.yml
index 0923286..9e3748d 100644
--- a/kubernetes/master/common.yml
+++ b/kubernetes/master/common.yml
@@ -23,4 +23,6 @@
         sriov:
           enabled: ${_param:kubernetes_sriov_enabled}
           source: ${_param:kubernetes_sriov_source}
-          source_hash: ${_param:kubernetes_sriov_source_hash}
\ No newline at end of file
+          source_hash: ${_param:kubernetes_sriov_source_hash}
+        flannel:
+          enabled: ${_param:kubernetes_flannel_enabled}