commit 8c837d2ac912c5b2d336689a13fce11ef747d80a
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Fri Aug 11 20:55:53 2017 +0200
committer Matthew Mosesohn <mmosesohn@mirantis.com> Tue Aug 22 20:19:56 2017 +0000
tree 3e07d9ba379372e680d07967a7dbd2aeb6fabdc9
parent de059898181cc142db2fbe37d1da92f9766165a6

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

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml

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}