commit 65baceb261e27f4fda19ac0a2850ee14072d9e15
author Matthew Mosesohn <mmosesohn@mirantis.com> Wed Jun 21 17:33:27 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Mon Jun 26 18:21:04 2017 +0300
tree e19812f107f6377c9b11dd4ff789c6116c477024
parent dc241dc0d060566e36dc2da6f15a9ad133ecd904

Add contrail linklocal for apiserver

Disables dashboard by default because of missing params
for endpoint. Will fix in the future.

Also fix ref to contrail apiserver in CNI

Change-Id: I98c429fd2435a1985bdce3afe613f63cc3492f16

metadata/service/master/cluster.yml

diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index eee68bf..ffb5754 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -20,6 +20,7 @@
         allow_privileged: True
       apiserver:
         address: ${_param:cluster_local_address}
+        internal_address: ${_param:kubernetes_internal_api_address}
         insecure_address: 127.0.0.1
         insecure_port: 8080
         count: 3
@@ -47,7 +48,7 @@
             server: 127.0.0.1#10053
             log-facility: "-"
         dashboard:
-          enabled: True
+          enabled: False
         heapster_influxdb:
           enabled: False
         helm:
@@ -68,6 +69,11 @@
           enabled: False
           name: network-manager
           creates: deployment
+        virtlet:
+          enabled: False
+          hosts: ${_param:kubernetes_virtlet_hosts}
+          namespace: kube-system
+          image: Mirantis/virtlet:latest
       token:
         admin: ${_param:kubernetes_admin_token}
         kubelet: ${_param:kubernetes_kubelet_token}

metadata/service/master/single.yml

diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index d9d24a1..1a9cbf5 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -20,6 +20,7 @@
         allow_privileged: True
       apiserver:
         address: ${_param:single_address}
+        internal_address: ${_param:kubernetes_internal_api_address}
         insecure_address: 127.0.0.1
         insecure_port: 8080
         daemon_opts:
@@ -42,7 +43,7 @@
             server: 127.0.0.1#10053
             log-facility: "-"
         dashboard:
-          enabled: True
+          enabled: False
         heapster_influxdb:
           enabled: False
         helm: