summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-08 01:20:47 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-11 19:44:12 +0100
commit15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (patch)
tree8233a5cb7b2e7d944fc33267bc9a5ca2801add17 /mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha
parent33d945e3045f68ea7cbd2f1b8d01618cb3fed23c (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/baremetal-mcp-pike-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml8
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 164d90c42..3b237eb22 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: