Rest of dynamic classification
Change-Id: Id0f97c5df80e9458a55ad048da30033ce084231b
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
index 6aa8575..88bbc73 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
@@ -37,13 +37,18 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
- salt_master:
+ infra_config:
expression: <<node_hostname>>__equals__cfg01
cluster_param:
infra_config_address:
value_template: <<node_ip>>
infra_config_deploy_address:
value_template: <<node_ip>>
+ infra_proxy:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.stacklight.proxy
kubernetes_control01:
expression: <<node_hostname>>__equals__ctl01
cluster_param:
@@ -64,6 +69,21 @@
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+ stacklight_monitor01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_node01_address:
+ value_template: <<node_ip>>
+ stacklight_monitor02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_node02_address:
+ value_template: <<node_ip>>
+ stacklight_monitor03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_node03_address:
+ value_template: <<node_ip>>
node:
prx_node:
name: ${_param:kubernetes_proxy_node01_hostname}
diff --git a/classes/system b/classes/system
index 883c626..baf830e 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 883c6269f791f64dce33d95c502e20c661a6c39c
+Subproject commit baf830eb4645af839ea9ccbe9eff1a91465f9a5e