Change IP value template in class_mappings

Change-Id: I9fb474c9454d712818c06058a45d10979aab2c38
diff --git a/classes/cluster/sl_k8s_contrail/infra/config.yml b/classes/cluster/sl_k8s_contrail/infra/config.yml
index 3def1ca..9af6915 100644
--- a/classes/cluster/sl_k8s_contrail/infra/config.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/config.yml
@@ -31,7 +31,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:
@@ -40,36 +40,36 @@
           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>>
         kubernetes_control01:
           expression: <<node_hostname>>__equals__ctl01
           cluster_param:
             kubernetes_control_node01_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         kubernetes_control02:
           expression: <<node_hostname>>__equals__ctl02
           cluster_param:
             kubernetes_control_node02_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         kubernetes_control03:
           expression: <<node_hostname>>__equals__ctl03
           cluster_param:
             kubernetes_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:
@@ -79,22 +79,22 @@
           expression: <<node_hostname>>__equals__prx01
           cluster_param:
             kubernetes_proxy_node01_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         stacklight_node01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
             stacklight_node03_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         stacklight_node02:
           expression: <<node_hostname>>__equals__mon02
           cluster_param:
             stacklight_node03_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         stacklight_node03:
           expression: <<node_hostname>>__equals__mon03
           cluster_param:
             stacklight_node03_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         kubernetes_compute:
           expression: <<node_hostname>>__startswith__cmp
           node_class: