Change dns settings for k8s-calico models
Change-Id: I38ace8bf0ae64a0ff2b443832f2db88ea5a9a6cc
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 2cfbf60..be4d1c7 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -43,9 +43,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 9f15d54..6e46f13 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -70,13 +70,6 @@
linux:
network:
- resolv:
- domain: k8s-aio-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:4
- purge_hosts: true
host:
ctl01:
address: ${_param:kubernetes_control_node01_address}
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
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
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 2d10e13..bb04c5e 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -47,9 +47,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
primary_interface:
route:
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/init.yml
index 766f396..b4aa8f8 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/init.yml
@@ -65,13 +65,6 @@
linux:
network:
- resolv:
- domain: k8s-ha-calico-cloudprovider.local
- options:
- - ndots:5
- - timeout:2
- - attempts:4
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index 7bfcaed..fd3b379 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -50,9 +50,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 47777ea..cd92306 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -92,13 +92,6 @@
linux:
network:
- resolv:
- domain: k8s-ha-calico-flannel-virtlet.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index f2c500e..7afc253 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -34,9 +34,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
primary_interface:
route:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
index faab6a1..d5cf684 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
@@ -59,13 +59,6 @@
linux:
network:
- resolv:
- domain: k8s-ha-calico-syndic.local
- options:
- - ndots:5
- - timeout:2
- - attempts:4
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index c0ed6e5..c7bbc73 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -44,9 +44,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 150cbe3..7efad95 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -91,13 +91,6 @@
linux:
network:
- resolv:
- domain: k8s-ha-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:4
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 0355f3b..c041583 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -44,9 +44,9 @@
network:
resolv:
dns:
- - 10.254.0.10
- - 172.18.176.4
- 172.18.208.44
+ - 172.18.176.4
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 80bbc67..79cccbe 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -82,12 +82,6 @@
linux:
network:
- resolv:
- domain: sl-k8s-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:4
host:
ctl:
address: ${_param:kubernetes_control_address}