Change IP value template in class_mappings
Change-Id: I9fb474c9454d712818c06058a45d10979aab2c38
diff --git a/classes/cluster/k8s_aio_calico/infra/config.yml b/classes/cluster/k8s_aio_calico/infra/config.yml
index de701cf..c8f630f 100644
--- a/classes/cluster/k8s_aio_calico/infra/config.yml
+++ b/classes/cluster/k8s_aio_calico/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,24 +40,24 @@
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>>
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>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
diff --git a/classes/cluster/k8s_ha_calico/infra/config.yml b/classes/cluster/k8s_ha_calico/infra/config.yml
index b385e2e..a31351f 100644
--- a/classes/cluster/k8s_ha_calico/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico/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,26 +40,26 @@
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>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
diff --git a/classes/cluster/k8s_ha_contrail/infra/config.yml b/classes/cluster/k8s_ha_contrail/infra/config.yml
index f4b4adc..7a50368 100644
--- a/classes/cluster/k8s_ha_contrail/infra/config.yml
+++ b/classes/cluster/k8s_ha_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,41 +40,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>>
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:
opencontrail_control_node03_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
diff --git a/classes/cluster/os_ha_contrail/infra/config.yml b/classes/cluster/os_ha_contrail/infra/config.yml
index 2e3076c..16d7f32 100755
--- a/classes/cluster/os_ha_contrail/infra/config.yml
+++ b/classes/cluster/os_ha_contrail/infra/config.yml
@@ -26,8 +26,8 @@
_param:
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
- reclass_config_master: 192.168.10.100
- single_address: 172.16.10.100
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
salt_minion_ca_host: ${linux:network:fqdn}
@@ -61,7 +61,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:
@@ -70,41 +70,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:
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index ab1caec..3c16c65 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -60,7 +60,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:
@@ -69,26 +69,26 @@
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>>
openstack_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index bd09d54..596d18f 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -32,7 +32,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:
@@ -41,9 +41,9 @@
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>>
infra_proxy:
@@ -55,17 +55,17 @@
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>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -75,17 +75,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:
prx_node:
name: ${_param:kubernetes_proxy_node01_hostname}
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:
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:
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index f5a2e7e..0d5da93 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -62,7 +62,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:
@@ -71,26 +71,26 @@
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>>
openstack_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -105,17 +105,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:
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 88bbc73..b840d0a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
@@ -32,7 +32,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:
@@ -41,9 +41,9 @@
expression: <<node_hostname>>__equals__cfg01
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>>
infra_proxy:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -53,17 +53,17 @@
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>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -73,17 +73,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:
prx_node:
name: ${_param:kubernetes_proxy_node01_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
index 1afe68f..c229379 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
@@ -30,7 +30,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:
@@ -39,24 +39,24 @@
expression: <<node_hostname>>__equals__cfg01
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>>
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>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class: