aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-16 23:29:54 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-31 16:57:50 +0100
commitbadd6a1c1cc6c300ada80244140231b7e5dafc81 (patch)
tree67dedc9023b00aef10644f1d1b27c56f284597b4 /mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv
parentbcc13c53a58f4e7df800e13a4775432fe3b5395f (diff)
[baremetal] Move salt master IP to PXE/admin
Use PXE/admin network for salt traffic from/to all minions except cfg01, mas01. This allows us to drop the route to admin net from cfg01. Change-Id: Ic2526f1ff77afe5d92ced900971f4c8f78d2d8a2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d4ab072aeab143ce72e4b81122d4580915a4ad1a)
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
index b8b8fb673..387b57f8b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
@@ -8,7 +8,7 @@
---
parameters:
_param:
- reclass_config_master: 10.20.0.2
+ opnfv_salt_master_ip: 10.20.0.2
opnfv_maas_mcp_address: 10.20.0.3
opnfv_net_mcpcontrol: 10.20.0.0
opnfv_net_mcpcontrol_mask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index c00cafd75..64f75350c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -8,7 +8,7 @@
---
parameters:
_param:
- reclass_config_master: ${SALT_MASTER}
+ opnfv_salt_master_ip: ${SALT_MASTER}
opnfv_maas_mcp_address: ${MAAS_IP}
opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
opnfv_net_mcpcontrol_mask: 255.255.255.0