From 1b03bd3ec9ff4a3897e007dfcd95d49d017ec323 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Wed, 13 Sep 2017 14:15:07 +0200 Subject: Pod Descriptor File compatible reclass structure Implementation for baremetal-mcp-ocata-ovs-ha scenario JIRA: FUEL-275 Change-Id: Id6ab5697f993ac9faa019c3c10ba4ed4b7b6db01 Signed-off-by: Guillermo Herrero (cherry picked from commit 5c0a09fbd0f377df56bfcfe94b262225a34f98ff) --- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 94ccc9e2f..60a0b67a4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -20,7 +20,7 @@ parameters: infra_config_address: 10.167.4.100 infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 - infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address} + infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} infra_maas_node01_external_address: 10.16.0.3 infra_compute_node01_address: 10.167.4.141 infra_compute_node02_address: 10.167.4.142 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 bdf7fea01..61f35f5e6 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 @@ -32,13 +32,13 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: 'hwe-16.04' subnets: - opnfv_fuel_maas_pxe: - name: ${_param:opnfv_fuel_maas_pxe_network}/24 - cidr: ${_param:opnfv_fuel_maas_pxe_network}/24 + opnfv_maas_pxe: + name: ${_param:opnfv_maas_pxe_network}/24 + cidr: ${_param:opnfv_maas_pxe_network}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_fuel_maas_pxe_iprange_start} - end: ${_param:opnfv_fuel_maas_pxe_iprange_end} + start: ${_param:opnfv_maas_pxe_iprange_start} + end: ${_param:opnfv_maas_pxe_iprange_end} type: dynamic vlans: untagged: -- cgit 1.2.3-korg