Allow to set default_plugin for genie.
Change-Id: I3016ddffbf01f27a53f5b362da669e2e3d925b4e
diff --git a/kubernetes/files/flannel/flannel.conflist b/kubernetes/files/flannel/flannel.conflist
index 583e5e6..b7cdd13 100644
--- a/kubernetes/files/flannel/flannel.conflist
+++ b/kubernetes/files/flannel/flannel.conflist
@@ -12,6 +12,7 @@
},
{
"type": "portmap",
+ "cniVersion": "0.3.0",
"capabilities": {
"portMappings": true
}
diff --git a/kubernetes/files/genie/genie.conf b/kubernetes/files/genie/genie.conf
index 819ee56..4f4bfa1 100644
--- a/kubernetes/files/genie/genie.conf
+++ b/kubernetes/files/genie/genie.conf
@@ -5,6 +5,9 @@
"log_level": "info",
"datastore_type": "kubernetes",
"hostname": "{{ hostname }}",
+ {%- if default_plugin is defined %}
+ "default_plugin": "{{ default_plugin }}",
+ {%- endif %}
"policy": {
"type": "k8s"
},
diff --git a/kubernetes/master/genie.sls b/kubernetes/master/genie.sls
index 4e31c7c..5851c22 100644
--- a/kubernetes/master/genie.sls
+++ b/kubernetes/master/genie.sls
@@ -14,6 +14,9 @@
- template: jinja
- defaults:
hostname: {{ master.host.name }}{% if master.host.get('domain') %}.{{ master.host.domain }}{%- endif %}
+ {%- if master.network.genie.default_plugin is defined %}
+ default_plugin: {{ master.network.genie.default_plugin }}
+ {%- endif %}
/tmp/genie/:
file.directory:
diff --git a/kubernetes/pool/genie.sls b/kubernetes/pool/genie.sls
index 555a6e4..c00e080 100644
--- a/kubernetes/pool/genie.sls
+++ b/kubernetes/pool/genie.sls
@@ -12,6 +12,9 @@
- template: jinja
- defaults:
hostname: {{ pool.host.name }}{% if pool.host.get('domain') %}.{{ pool.host.domain }}{%- endif %}
+ {%- if pool.network.genie.default_plugin is defined %}
+ default_plugin: {{ pool.network.genie.default_plugin }}
+ {%- endif %}
/tmp/genie/:
file.directory: