Merge "Fix cniVersion for non-genie deployments."
diff --git a/kubernetes/files/calico/calico.conf b/kubernetes/files/calico/calico.conf
index 81e383f..0a231aa 100644
--- a/kubernetes/files/calico/calico.conf
+++ b/kubernetes/files/calico/calico.conf
@@ -3,7 +3,11 @@
{
"nodeName": "{{ pool.host.name }}{% if pool.host.get('domain') %}.{{ pool.host.domain }}{%- endif %}",
"name": "calico-k8s-network",
+ {%- if pool.network.get('genie', {}).get('enabled', False) %}
"cniVersion": "0.3.0",
+ {%- else %}
+ "cniVersion": "0.2.0",
+ {%- endif %}
"type": "calico",
"etcd_endpoints": "{% for member in pool.network.calico.etcd.members %}http{% if pool.network.calico.etcd.get('ssl', {}).get('enabled') %}s{% endif %}://{{ member.host }}:{{ member.port }}{% if not loop.last %},{% endif %}{% endfor %}",
{%- if pool.network.calico.etcd.get('ssl', {}).get('enabled') %}
diff --git a/kubernetes/files/opencontrail/opencontrail.conf b/kubernetes/files/opencontrail/opencontrail.conf
index 290cf2c..71f5881 100644
--- a/kubernetes/files/opencontrail/opencontrail.conf
+++ b/kubernetes/files/opencontrail/opencontrail.conf
@@ -1,6 +1,10 @@
{%- from "kubernetes/map.jinja" import pool with context %}
{
+ {%- if pool.network.get('genie', {}).get('enabled', False) %}
"cniVersion": "0.3.0",
+ {%- else %}
+ "cniVersion": "0.2.0",
+ {%- endif %}
"contrail" : {
"apiserver": {"address": "{{ pool.network.opencontrail.config.api.host }}", "port": {{ pool.network.opencontrail.config.api.get('port', 8082) }}, "default-domain": "default-domain"},
"vrouter" : {