diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-08 01:20:47 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-11 19:44:12 +0100 |
| commit | 15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (patch) | |
| tree | 8233a5cb7b2e7d944fc33267bc9a5ca2801add17 /mcp/reclass/classes/cluster/all-mcp-arch-common | |
| parent | 33d945e3045f68ea7cbd2f1b8d01618cb3fed23c (diff) | |
[baremetal] Move all MaaS PXE net config to PDF
- s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars;
- patches: pharos: Add MaaS PXE network to installer adapter;
- runtime.yml{,.template}: move to installer adapter, update
pod_config.yml example;
- drop MAAS_PXE_NETWORK global env var, now read strictly from PDF;
JIRA: FUEL-313
Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common')
3 files changed, 5 insertions, 12 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example index a3a78d608..66999de86 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example @@ -17,6 +17,11 @@ parameters: opnfv_infra_kvm_node02_address: 10.167.4.142 opnfv_infra_kvm_node03_address: 10.167.4.143 + opnfv_infra_maas_pxe_network_address: 192.168.11.0 + opnfv_infra_maas_pxe_address: 192.168.11.3 + opnfv_infra_maas_pxe_start_address: 192.168.11.5 + opnfv_infra_maas_pxe_end_address: 192.168.11.250 + opnfv_openstack_gateway_node01_address: 10.167.4.124 opnfv_openstack_gateway_node02_address: 10.167.4.125 opnfv_openstack_gateway_node03_address: 10.167.4.126 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 4fd9e0368..b8b8fb673 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 @@ -12,9 +12,3 @@ parameters: opnfv_maas_mcp_address: 10.20.0.3 opnfv_net_mcpcontrol: 10.20.0.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 - - # These should be moved to pod_config.yml and read based on PDF admin net - opnfv_maas_pxe_network_address: 192.168.11.0 - opnfv_maas_pxe_address: 192.168.11.3 - opnfv_maas_pxe_start_address: 192.168.11.5 - opnfv_maas_pxe_end_address: 192.168.11.250 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 342dc77aa..c00cafd75 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 @@ -12,9 +12,3 @@ parameters: opnfv_maas_mcp_address: ${MAAS_IP} opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 - - # These should be moved to pod_config.yml and MAAS_PXE_NETWORK dropped - opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK} - opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3 - opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5 - opnfv_maas_pxe_end_address: ${MAAS_PXE_NETWORK%.*}.250 |