Fix salt master IP
Change-Id: I2698344e779381bed48df2b63fe9ad136738b80d
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster/aaa-ha-freeipa/infra/init.yml
index 783c19f..fbe95d7 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/init.yml
@@ -13,7 +13,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-aaa-freeipa.local
cluster_name: virtual-aaa-freeipa
diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster/ceph-ha/infra/init.yml
index c9183ed..c4c7d0b 100644
--- a/classes/cluster/ceph-ha/infra/init.yml
+++ b/classes/cluster/ceph-ha/infra/init.yml
@@ -14,7 +14,7 @@
# infra service addresses
infra_config_hostname: cfg01
# infra_config_address: 172.16.10.100
-# infra_config_deploy_address: 192.168.10.100
+# infra_config_deploy_address: 192.168.10.90
cluster_domain: ceph-ha.local
cluster_name: ceph_ha
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index 3f5db90..583ce76 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -16,7 +16,7 @@
admin_email: root@localhosti
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
salt_minion_ca_host: ci01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
salt_api_password: hovno12345!
diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index 31e590a..868221e 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -15,7 +15,7 @@
apt_mk_version: nightly
infra_config_hostname: cid01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
salt_minion_ca_host: cid01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
linux:
diff --git a/classes/cluster/k8s-aio-calico/infra/init.yml b/classes/cluster/k8s-aio-calico/infra/init.yml
index d6bda6d..763d163 100644
--- a/classes/cluster/k8s-aio-calico/infra/init.yml
+++ b/classes/cluster/k8s-aio-calico/infra/init.yml
@@ -13,7 +13,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index 8fccc4f..d10b0d4 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/init.yml
@@ -13,7 +13,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: k8s-aio-contrail.local
cluster_name: k8s_aio_contrail
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index 62922ee..253e3f6 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -9,7 +9,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
diff --git a/classes/cluster/k8s-ha-contrail/infra/init.yml b/classes/cluster/k8s-ha-contrail/infra/init.yml
index fad2edc..7cb36c7 100644
--- a/classes/cluster/k8s-ha-contrail/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/init.yml
@@ -7,7 +7,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: k8s-ha-contrail.local
cluster_name: k8s_ha_contrail
diff --git a/classes/cluster/model-manager/infra/init.yml b/classes/cluster/model-manager/infra/init.yml
index 4478e59..697d92d 100644
--- a/classes/cluster/model-manager/infra/init.yml
+++ b/classes/cluster/model-manager/infra/init.yml
@@ -2,7 +2,7 @@
_param:
cluster_domain: model-manager.local
cluster_name: model_manager
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
cluster_public_host: mm.mcp.mirantis.net
linux:
diff --git a/classes/cluster/os-ha-contrail-40/infra/init.yml b/classes/cluster/os-ha-contrail-40/infra/init.yml
index fdb1dc3..c9958c7 100644
--- a/classes/cluster/os-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/init.yml
@@ -2,7 +2,7 @@
_param:
cluster_domain: os_ha_contrail_40.local
cluster_name: os_ha_contrail_40
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
diff --git a/classes/cluster/os-ha-contrail/infra/init.yml b/classes/cluster/os-ha-contrail/infra/init.yml
index 620e669..8567b96 100755
--- a/classes/cluster/os-ha-contrail/infra/init.yml
+++ b/classes/cluster/os-ha-contrail/infra/init.yml
@@ -2,7 +2,7 @@
_param:
cluster_domain: os-ha-contrail.local
cluster_name: os_ha_contrail
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index 027faca..758544b 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -14,7 +14,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index cb7e820..9e7f58d 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -8,7 +8,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: sl-k8s-contrail.local
cluster_name: sl_k8s_contrail
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster/sl-os-contrail/infra/init.yml
index 893c1d4..2590737 100755
--- a/classes/cluster/sl-os-contrail/infra/init.yml
+++ b/classes/cluster/sl-os-contrail/infra/init.yml
@@ -2,7 +2,7 @@
_param:
cluster_domain: sl-os-contrail.local
cluster_name: sl_os_contrail
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index c2dc133..a482086 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -2,7 +2,7 @@
_param:
cluster_domain: sl-os-ovs.local
cluster_name: sl_os_ovs
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
linux:
network:
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index 50b7893..e0425aa 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -32,7 +32,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index eba6c65..139289e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -34,7 +34,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 2365676..93b6d6d 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -33,7 +33,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index cfcb185..469507b 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -28,7 +28,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
index 226b5e1..43e282d 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -27,7 +27,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 67f9f01..64fb0a1 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -26,7 +26,7 @@
_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
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index fa7c6c4..3eaadc9 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -28,7 +28,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index 666de15..dc77ca6 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -27,7 +27,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index fe44865..ed9bbf6 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -40,7 +40,7 @@
_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
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index af5abe0..0f05600 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -40,7 +40,7 @@
_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
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index a6b94d7..3d6f018 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -32,7 +32,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
index 864492b..5e01c17 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
@@ -17,7 +17,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
index 6124602..bdd4642 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -14,7 +14,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico-minimal.local
cluster_name: virtual-mcp11-k8s-calico-minimal
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index a55f484..90bfd69 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -22,7 +22,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 5ffacc2..34a8fe1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -23,7 +23,7 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- infra_config_deploy_address: 192.168.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: virtual-mcp11-k8s-contrail.local
cluster_name: virtual-mcp11-k8s-contrail
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index ab3d282..c1528b4 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -31,7 +31,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 9580db4..b0b20c8 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -30,7 +30,7 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
+ reclass_config_master: 192.168.10.90
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd