Add node_cluster to all Syndic class_mapping expressions
Change-Id: I47fc41f39068750d86816b91485d0aeef2e37791
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index f3e98a4..0bd7355 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -51,22 +51,31 @@
cluster_domain:
value_template: <<node_domain>>
kubernetes_control01:
- expression: <<node_hostname>>__equals__ctl01
+ expression:
+ - <<node_hostname>>__equals__ctl01
+ - <<node_cluster>>__equals__k8s_ha_calico_syndic
cluster_param:
kubernetes_control_node01_address:
value_template: <<node_control_ip>>
kubernetes_control02:
- expression: <<node_hostname>>__equals__ctl02
+ expression:
+ - <<node_hostname>>__equals__ctl02
+ - <<node_cluster>>__equals__k8s_ha_calico_syndic
cluster_param:
kubernetes_control_node02_address:
value_template: <<node_control_ip>>
kubernetes_control03:
- expression: <<node_hostname>>__equals__ctl03
+ expression:
+ - <<node_hostname>>__equals__ctl03
+ - <<node_cluster>>__equals__k8s_ha_calico_syndic
cluster_param:
kubernetes_control_node03_address:
value_template: <<node_control_ip>>
kubernetes_compute:
- expression: <<node_hostname>>__startswith__cmp
+ expression:
+ - <<node_hostname>>__startswith__cmp
+ - <<node_cluster>>__equals__k8s_ha_calico_syndic
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index 4adbcbe..b60ba47 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -75,7 +75,6 @@
salt_master_host:
value_template: <<node_master_ip>>
infra_config:
- infra_config:
expression:
- <<node_hostname>>__startswith__cfg
- <<node_cluster>>__equals__os_ha_ovs_syndic
@@ -87,22 +86,30 @@
cluster_domain:
value_template: <<node_domain>>
openstack_control01:
- expression: <<node_hostname>>__equals__ctl01
+ expression:
+ - <<node_hostname>>__equals__ctl01
+ - <<node_cluster>>__equals__os_ha_ovs_syndic
cluster_param:
openstack_control_node01_address:
value_template: <<node_control_ip>>
openstack_control02:
- expression: <<node_hostname>>__equals__ctl02
+ expression:
+ - <<node_hostname>>__equals__ctl02
+ - <<node_cluster>>__equals__os_ha_ovs_syndic
cluster_param:
openstack_control_node02_address:
value_template: <<node_control_ip>>
openstack_control03:
- expression: <<node_hostname>>__equals__ctl03
+ expression:
+ - <<node_hostname>>__equals__ctl03
+ - <<node_cluster>>__equals__os_ha_ovs_syndic
cluster_param:
openstack_control_node03_address:
value_template: <<node_control_ip>>
openstack_compute:
- expression: <<node_hostname>>__startswith__cmp
+ expression:
+ - <<node_hostname>>__startswith__cmp
+ - <<node_cluster>>__equals__os_ha_ovs_syndic
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.compute
@@ -112,7 +119,9 @@
external_address:
value_template: <<node_external_ip>>
openstack_gateway:
- expression: <<node_hostname>>__startswith__gtw
+ expression:
+ - <<node_hostname>>__startswith__gtw
+ - <<node_cluster>>__equals__os_ha_ovs_syndic
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.gateway