fix missing definition for mon node
Change-Id: I4bf4bb61937d8b9fffd6d43e8ba91cca67b9ed78
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index db2efc2..91332ff 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -12,7 +12,7 @@
parameters:
_param:
salt_master_base_environment: prd
- reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab.git"
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
@@ -51,3 +51,12 @@
salt_master_host: ${_param:infra_config_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_proxy_node01_address}
+ mon_node:
+ name: ${_param:kubernetes_monitor_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra
+ params:
+ salt_master_host: ${_param:infra_config_address}
+ linux_system_codename: xenial
+ single_address: ${_param:kubernetes_monitor_node01_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 58263ad..cc710a8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -4,7 +4,6 @@
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
-- system.rsyslog.client.single
- cluster.virtual-mcp11-k8s-calico.kubernetes
- cluster.overwrite
parameters:
@@ -25,6 +24,11 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
interface:
ens4:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 0bc0d40..5659748 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -31,6 +31,9 @@
kubernetes_compute_node02_address: 172.16.10.106
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
+ kubernetes_monitor_node01_hostname: mon01
+ kubernetes_monitor_node01_address: 172.16.10.107
+
cluster_vip_address: ${_param:kubernetes_control_address}
cluster_local_address: ${_param:single_address}
@@ -88,3 +91,8 @@
names:
- ${_param:kubernetes_proxy_node01_hostname}
- ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
+ mon01:
+ address: ${_param:kubernetes_monitor_node01_address}
+ names:
+ - ${_param:kubernetes_monitor_node01_hostname}
+ - ${_param:kubernetes_monitor_node01_hostname}.${_param:cluster_domain}