commit 10676588eb6bca8cbbd60588c66290d4cff5b45c
author Michal Kobus <mkobus@mirantis.com> Mon Mar 12 11:57:32 2018 +0100
committer Michal Kobus <mkobus@mirantis.com> Mon Mar 12 12:28:42 2018 +0100
tree 17063509520fc84e80a7e68e72fbfa9ce69b0dc6
parent e2b90618f624a0c4e374f5b3219383c8c082159f

set different IP for salt-master

Set salt-master IP on ens4 to 172.16.10.90 to avoid
getting two IPs on master and collision with mon01.

Change-Id: I44881b51971801ca69c2f19df61277207535145c

classes/cluster/virtual-mcp11-contrail/infra/config.yml

diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 0f05600..4853abd 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -41,7 +41,7 @@
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master
     reclass_config_master: 192.168.10.90
-    single_address: 172.16.10.100
+    single_address: 172.16.10.90
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -118,7 +118,7 @@
           expression: <<node_hostname>>__equals__ntw03
           cluster_param:
             opencontrail_control_node03_address:
-              value_template: <<node_control_ip>>  
+              value_template: <<node_control_ip>>
         openstack_compute:
           expression: <<node_hostname>>__startswith__cmp
           node_class: