summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-23 21:51:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-23 21:51:34 +0000
commit39a14d6697d0c66d9ce412a9e1fca7c465625acb (patch)
tree2ccad9cdbe4912acf84616d3003036dc3bba027e /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra
parent6205a5cf55ba25a9a632ba8db930e1e0ab07b781 (diff)
parent1b03bd3ec9ff4a3897e007dfcd95d49d017ec323 (diff)
Merge "Pod Descriptor File compatible reclass structure" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml10
2 files changed, 6 insertions, 6 deletions
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: