fix missing contrail version
default to network version 3.0
Change-Id: If031575405964071b0a5baa34e3495176c9d1f52
diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index 8440409..61eda90 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -8,7 +8,7 @@
- group: root
- mode: 0755
-{%- if master.network.engine == "opencontrail" and master.network.version < 4.0 %}
+{%- if master.network.engine == "opencontrail" and master.network.get('version', 3.0) < 4.0 %}
/etc/kubernetes/addons/contrail_network_controller/contrail-network-controller-configmap.yml:
file.managed:
- source: salt://kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 991cb32..c237389 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -61,7 +61,6 @@
allow_privileged: true
network:
engine: opencontrail
- version: 3.0
config:
api:
host: 10.0.170.70