Move virtlet overrides to compute
Both computes and controllers can see pillar data when it is in compute.yml.
Computes need visiblity to this info to set up criproxy.
Change-Id: Ief3e88099b00b694dbac678b29f638dbbb0c7c1d
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 499f290..12e5170 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -47,5 +47,13 @@
contrail_cni:
image: ${_param:kubernetes_opencontrail_cni_image}
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: kube-system
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 0a87c12..3aa295b 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -31,13 +31,6 @@
enabled: ${_param:kubernetes_netchecker_enabled}
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
- virtlet:
- enabled: ${_param:kubernetes_virtlet_enabled}
- namespace: kube-system
- image: ${_param:kubernetes_virtlet_image}
- hosts:
- - ${_param:kubernetes_compute_node01_hostname}
- - ${_param:kubernetes_compute_node02_hostname}
contrail_network_controller:
namespace: kube-system
enabled: true