commit 009a1f3a8e0ec9e2fb7ceabae55516a2bb89bc2f
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Fri Apr 06 15:39:27 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Fri Apr 13 20:05:27 2018 +0400
tree 5cd58c9cccb3a2bb6b1f88f2e9e7b9b9bd145a31
parent 9feff0a55680afab50819021e8f0debe3416f3c4

Update virtual-mcp11-k8s-contrail

- Updated k8s part
- Minor updates for contrail part

Change-Id: Iad8cd491dcb33bd1fc03d05389ed0d3a848ef600
Related-PROD: PROD-18983

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

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index ddfd347..552047c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -7,13 +7,16 @@
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
-- cluster.overrides
+- cluster.virtual-mcp11-k8s-contrail
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_vip_interface: vhost0
     keepalived_vip_virtual_router_id: 60
+    cluster_local_address: ${_param:deploy_address}
   etcd:
     server:
+      bind:
+        host: ${_param:deploy_address}
       source:
         engine: docker_hybrid
       ssl:
@@ -22,7 +25,8 @@
     common:
       addons:
         dashboard:
-          enabled: false
+          enabled: ${_param:kubernetes_dashboard}
+          image: ${_param:kubernetes_dashboard_image}
         helm:
           enabled: ${_param:kubernetes_helm_enabled}
         netchecker:
@@ -30,9 +34,16 @@
           agent_image: ${_param:kubernetes_netchecker_agent_image}
           server_image: ${_param:kubernetes_netchecker_server_image}
         contrail_network_controller:
-          namespace: kube-system
-          enabled: true
+          namespace: ${_param:kubernetes_addon_namespace}
+          enabled: ${_param:kubernetes_contrail_network_controller}
           image: ${_param:kubernetes_contrail_network_controller_image}
+        dns:
+          enabled: ${_param:kubernetes_dns}
+          kubedns_image: ${_param:kubernetes_kubedns_image}
+          dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+          sidecar_image: ${_param:kubernetes_sidecar_image}
+          autoscaler:
+            image: ${_param:kubernetes_dns_autoscaler_image}
         coredns:
           enabled: ${_param:kubernetes_coredns_enabled}
         externaldns:
@@ -41,15 +52,13 @@
           provider: ${_param:kubernetes_externaldns_provider}
     master:
       kubelet:
+        address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       etcd:
         ssl:
           enabled: true
       namespace:
         netchecker:
-          enabled: true
-      namespace:
-        netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
       network:
         opencontrail: