Change IP value template in class_mappings
Change-Id: I9fb474c9454d712818c06058a45d10979aab2c38
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index 3bda588..c421baa 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -63,7 +63,7 @@
expression: all
node_param:
single_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
linux_system_codename:
value_template: <<node_os>>
salt_master_host:
@@ -72,41 +72,41 @@
expression: <<node_hostname>>__startswith__cfg
cluster_param:
infra_config_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
infra_config_deploy_address:
- value_template: <<node_ip>>
+ value_template: <<node_deploy_ip>>
cluster_domain:
value_template: <<node_domain>>
openstack_control01:
expression: <<node_hostname>>__equals__ctl01
cluster_param:
openstack_control_node01_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
openstack_control02:
expression: <<node_hostname>>__equals__ctl02
cluster_param:
openstack_control_node02_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
openstack_control03:
expression: <<node_hostname>>__equals__ctl03
cluster_param:
openstack_control_node03_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
opencontrail_control01:
expression: <<node_hostname>>__equals__ntw01
cluster_param:
opencontrail_control_node01_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
opencontrail_control02:
expression: <<node_hostname>>__equals__ntw02
cluster_param:
opencontrail_control_node02_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
opencontrail_control03:
expression: <<node_hostname>>__equals__ntw03
cluster_param:
opencontrail_control_node03_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
openstack_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -121,17 +121,17 @@
expression: <<node_hostname>>__equals__mon01
cluster_param:
stacklight_node01_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
stacklight_monitor02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
stacklight_node02_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
stacklight_monitor03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
stacklight_node03_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes: