diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-18 15:35:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-18 15:35:56 +0000 |
| commit | a4abff17c7b71408762353bb1ef52d9ffbec2fb7 (patch) | |
| tree | cee4340941dac799e7aa01ff3bc642f158846b74 /mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv | |
| parent | 8494ec245aa24f00f2412d0f9d1e1e32591708d7 (diff) | |
| parent | d4ab072aeab143ce72e4b81122d4580915a4ad1a (diff) | |
Merge "[baremetal] Move salt master IP to PXE/admin"
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml index b8b8fb673..387b57f8b 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-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-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template index c00cafd75..64f75350c 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-arch-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 |