Update k8s-ha-* models
Related-PROD: PROD-25976
Change-Id: Id31e6604c71534086e90b63ae1c0cf3a319ec0b8
diff --git a/classes/cluster/k8s-ha-calico/infra/config.yml b/classes/cluster/k8s-ha-calico/infra/config.yml
index c505d53..d582161 100644
--- a/classes/cluster/k8s-ha-calico/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico/infra/config.yml
@@ -1,6 +1,4 @@
classes:
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
@@ -8,7 +6,7 @@
- system.salt.minion.cert.k8s_server
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
-- cluster.k8s-ha-calico
+- cluster.k8s-ha-calico.infra
parameters:
_param:
salt_master_base_environment: prd
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index fc7bd2e..7f35825 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -1,9 +1,16 @@
classes:
+- system.defaults
- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.network.dynamic_hosts
+- system.salt.minion.single
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.salt-formulas
- system.openssh.server.team.all
+- cluster.k8s-ha-calico.kubernetes
+- cluster.overrides
parameters:
_param:
# infra service addresses
@@ -15,6 +22,11 @@
cluster_name: k8s-ha-calico
apt_mk_version: nightly
primary_interface: ens3
+ control_interface: ens4
+
+ dns_server01: 172.18.176.6
+ dns_server02: 172.17.44.91
+
linux:
network:
host: