Fix duplicate node definition
Change-Id: I2da65cac9f27ffe28eefd2b6bcec2a7ab2eeb691
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index e3c77d4..04821cd 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -110,6 +110,16 @@
cluster_param:
openstack_control_node03_address:
value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
opencontrail_control01:
expression: <<node_hostname>>__equals__ntw01
cluster_param:
@@ -125,32 +135,21 @@
cluster_param:
opencontrail_control_node03_address:
value_template: <<node_control_ip>>
- openstack_compute:
- expression: <<node_hostname>>__startswith__cmp
- node_class:
- value_template:
- - cluster.<<node_cluster>>.openstack.compute
- node_param:
- tenant_address:
- value_template: <<node_tenant_ip>>
- external_address:
- value_template: <<node_external_ip>>
- stacklight_monitor01:
+ stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node01_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
- stacklight_monitor02:
+ stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node02_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
- stacklight_monitor03:
+ stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
- node:
prx_node:
name: ${_param:openstack_proxy_node01_hostname}
domain: ${_param:cluster_domain}