Update sl_k8s_calico models
Change-Id: I89bcf21ed3139110106d6bd3ffe8d30a61dbe553
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index d743dea..a0c051a 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -5,10 +5,11 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl_k8s_calico.kubernetes.compute
-- cluster.sl_k8s_calico
+- cluster.sl_k8s_calico.infra
+- cluster.overrides
parameters:
_param:
- keepalived_vip_interface: ${_param:primary_interface}
+ keepalived_vip_interface: ens3
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -23,10 +24,15 @@
kubernetes:
common:
addons:
- netchecker:
- enabled: true
helm:
- enabled: true
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
master:
etcd:
ssl:
@@ -37,4 +43,5 @@
enabled: true
namespace:
netchecker:
- enabled: true
+ enabled: ${_param:kubernetes_netchecker_enabled}
+