Drivetrain HA clusters model fixes
Change-Id: I46083e77c08d9e830d3574efcd0ab1b3627b2a6d
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index 6814c21..f3e98a4 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -7,7 +7,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_syndic
parameters:
_param:
salt_master_base_environment: prd
@@ -40,7 +40,9 @@
salt_master_host:
value_template: <<node_master_ip>>
infra_config:
- expression: <<node_hostname>>__startswith__cfg
+ expression:
+ - <<node_hostname>>__startswith__cfg
+ - <<node_cluster>>__equals__k8s_ha_calico_syndic
cluster_param:
infra_config_address:
value_template: <<node_control_ip>>
diff --git a/classes/cluster/k8s_ha_calico_syndic/init.yml b/classes/cluster/k8s_ha_calico_syndic/init.yml
index c672dd1..7b55c9f 100644
--- a/classes/cluster/k8s_ha_calico_syndic/init.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/init.yml
@@ -1,4 +1,4 @@
classes:
-- cluster.k8s_ha_calico.kubernetes
-- cluster.k8s_ha_calico.infra
+- cluster.k8s_ha_calico_syndic.kubernetes
+- cluster.k8s_ha_calico_syndic.infra
- cluster.overrides
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
index 3bb7828..29203d0 100644
--- a/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
@@ -3,7 +3,7 @@
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
-- cluster.k8s_ha_calico
+- cluster.k8s_ha_calico_syndic
parameters:
_param:
kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
index 1003ff7..14772c9 100644
--- a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
@@ -4,8 +4,8 @@
- system.linux.system.repo.docker
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
-- cluster.k8s_ha_calico.kubernetes.compute
-- cluster.k8s_ha_calico
+- cluster.k8s_ha_calico_syndic.kubernetes.compute
+- cluster.k8s_ha_calico_syndic
parameters:
_param:
keepalived_vip_interface: ${_param:primary_interface}