diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-12 15:51:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-12-12 15:51:22 +0000 |
commit | 2b0a1581730e5a96c6e8949237bb54d4d0ea2571 (patch) | |
tree | ab680eaf7974e6002387be9b013c180243090e8e /mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha | |
parent | 5c2d26dc7c9fd1abb531a8fedd9982383bf2367e (diff) | |
parent | 15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (diff) |
Merge "[baremetal] Move all MaaS PXE net config to PDF"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml index bf88816c4..4f93914cf 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml @@ -27,7 +27,7 @@ parameters: infra_config_address: ${_param:opnfv_infra_config_address} infra_config_deploy_address: ${_param:reclass_config_master} infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} - infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} + infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_pxe_address} infra_kvm_address: ${_param:opnfv_infra_kvm_address} infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml index e8c2965f7..93db0ed14 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -42,12 +42,12 @@ parameters: default_min_hwe_kernel: 'hwe-16.04' subnets: opnfv_maas_pxe: - name: ${_param:opnfv_maas_pxe_network_address}/24 - cidr: ${_param:opnfv_maas_pxe_network_address}/24 + name: ${_param:opnfv_infra_maas_pxe_network_address}/24 + cidr: ${_param:opnfv_infra_maas_pxe_network_address}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_maas_pxe_start_address} - end: ${_param:opnfv_maas_pxe_end_address} + start: ${_param:opnfv_infra_maas_pxe_start_address} + end: ${_param:opnfv_infra_maas_pxe_end_address} type: dynamic vlans: untagged: |