commit 5e60c7e8c9e08153abbb11b567316dcad93468f3
author Matthew Mosesohn <mmosesohn@mirantis.com> Fri Jun 23 18:06:25 2017 +0300
committer Tomas Kukral <tkukral@mirantis.com> Mon Jul 10 12:53:52 2017 +0000
tree f15fc7c4dc40e69cc7e4b9a3c1df3705aac7f5f3
parent 0b4250a974f1fc3d58d9c1132548d62c94cd4c5f

Fix k8s-calico DNS

Max nameservers is three, so the k8s/compute role should add only 1
because of reclass deep merging.

Not updating Contrail because DNS is not hardcoded there.
Change-Id: I7a0c39b8cc178b34d73083953504ea52c8f642d8

classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
index e102028..6124602 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -24,7 +24,7 @@
       resolv:
         dns:
           - 172.18.176.4
-          - 172.18.176.7
+          - 172.18.208.44
       host:
         cfg01:
           address: ${_param:infra_config_address}

classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index 1df5f06..7f42665 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -31,8 +31,6 @@
       resolv:
         dns:
           - 10.254.0.10
-          - 172.18.176.4
-          - 172.18.176.7
       interface:
         ens4:
           route: