aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 20:27:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-04 20:27:47 +0000
commit61b418dd534fe09e2550248d6d909a2399a18d27 (patch)
tree4e7a6517b57cdaa29bbf5877360e5d1f0e1ff87d /mcp/reclass
parenta05f8d2682f2449d7d10e52038c56a0af6357def (diff)
parent8ec927497b7ee0fd3b7346e957878173b080ef6a (diff)
Merge "Identify jump host bridges based on IDF / PDF nets"
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml8
4 files changed, 18 insertions, 17 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index b07ae13bd..1488da271 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -1,9 +1,10 @@
parameters:
_param:
reclass_config_master: ${SALT_MASTER}
-
opnfv_maas_mcp_address: ${MAAS_IP}
- opnfv_maas_pxe_network: ${MAAS_PXE_NETWORK}
- opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK_ROOTSTR}.3
- opnfv_maas_pxe_iprange_start: ${MAAS_PXE_NETWORK_ROOTSTR}.5
- opnfv_maas_pxe_iprange_end: ${MAAS_PXE_NETWORK_ROOTSTR}.250
+
+ # These should be moved to pod_config.yml and read based on PDF admin net
+ 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-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index 737d6cb6a..2e39588f4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -33,12 +33,12 @@ parameters:
default_min_hwe_kernel: 'hwe-16.04'
subnets:
opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network}/24
- cidr: ${_param:opnfv_maas_pxe_network}/24
+ name: ${_param:opnfv_maas_pxe_network_address}/24
+ cidr: ${_param:opnfv_maas_pxe_network_address}/24
gateway_ip: ${_param:single_address}
iprange:
- start: ${_param:opnfv_maas_pxe_iprange_start}
- end: ${_param:opnfv_maas_pxe_iprange_end}
+ start: ${_param:opnfv_maas_pxe_start_address}
+ end: ${_param:opnfv_maas_pxe_end_address}
type: dynamic
vlans:
untagged:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 00ee552a3..db48750d0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -33,12 +33,12 @@ parameters:
default_min_hwe_kernel: 'hwe-16.04'
subnets:
opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network}/24
- cidr: ${_param:opnfv_maas_pxe_network}/24
+ name: ${_param:opnfv_maas_pxe_network_address}/24
+ cidr: ${_param:opnfv_maas_pxe_network_address}/24
gateway_ip: ${_param:single_address}
iprange:
- start: ${_param:opnfv_maas_pxe_iprange_start}
- end: ${_param:opnfv_maas_pxe_iprange_end}
+ start: ${_param:opnfv_maas_pxe_start_address}
+ end: ${_param:opnfv_maas_pxe_end_address}
type: dynamic
vlans:
untagged:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index cebc779b1..c0a487417 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -33,12 +33,12 @@ parameters:
default_min_hwe_kernel: 'hwe-16.04'
subnets:
opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network}/24
- cidr: ${_param:opnfv_maas_pxe_network}/24
+ name: ${_param:opnfv_maas_pxe_network_address}/24
+ cidr: ${_param:opnfv_maas_pxe_network_address}/24
gateway_ip: ${_param:single_address}
iprange:
- start: ${_param:opnfv_maas_pxe_iprange_start}
- end: ${_param:opnfv_maas_pxe_iprange_end}
+ start: ${_param:opnfv_maas_pxe_start_address}
+ end: ${_param:opnfv_maas_pxe_end_address}
type: dynamic
vlans:
untagged: