aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-12 15:51:22 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-12 15:51:22 +0000
commit2b0a1581730e5a96c6e8949237bb54d4d0ea2571 (patch)
treeab680eaf7974e6002387be9b013c180243090e8e /mcp/reclass
parent5c2d26dc7c9fd1abb531a8fedd9982383bf2367e (diff)
parent15e982f0d00dbcc72be2f5b25dab34b3f3efd912 (diff)
Merge "[baremetal] Move all MaaS PXE net config to PDF"
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example5
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml6
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template6
-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
5 files changed, 10 insertions, 17 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
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: