commit 0d9909974e91cbe6cd27f9f1e1a0241de1f3b482
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue May 08 22:56:48 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue May 08 22:56:48 2018 +0400
tree 522a05107ce306f68165dabbf6575ef403bcb94b
parent a61b72ba122eae1fe37625c86265a2475ee72915

Change dns settings for k8s-calico models

Change-Id: I38ace8bf0ae64a0ff2b443832f2db88ea5a9a6cc

classes/cluster/k8s-compact/kubernetes/compute.yml

diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 092870f..13b308d 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -45,9 +45,9 @@
     network:
       resolv:
         dns:
-          - ${_param:kubernetes_internal_dns_address}
-          - 172.18.176.4
           - 172.18.208.44
+          - 172.18.176.4
+          - ${_param:kubernetes_internal_dns_address
       interface:
         ens3:
           enabled: true

classes/cluster/k8s-compact/kubernetes/init.yml

diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 5ecb365..9e8e135 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -48,13 +48,3 @@
     kubernetes_virtlet_enabled: true
     kubernetes_coredns_enabled: false
     kubernetes_externaldns_enabled: false
-
-  linux:
-    network:
-      resolv:
-        domain: k8s-compact.local
-        options:
-          - ndots:5
-          - timeout:2
-          - attempts:4
-      purge_hosts: true
\ No newline at end of file