Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix parametrized nic name variables
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
baremetal-mcp-ocata-ovs-dpdk-ha
/
infra
/
maas.yml
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
783e4ec
..
9c76526
100644
(file)
--- 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
@@
-1,13
+1,13
@@
---
classes:
---
classes:
- - system.linux.system.repo.saltstack.xenial
- system.maas.region.single
- system.maas.region.single
+ - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
_param:
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
_param:
- dhcp_interface:
ens3
- primary_interface:
ens4
- pxe_interface:
ens5
+ dhcp_interface:
${_param:opnfv_fn_vm_primary_interface}
+ primary_interface:
${_param:opnfv_fn_vm_secondary_interface}
+ pxe_interface:
${_param:opnfv_fn_vm_tertiary_interface}
interface_mtu: 1500
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
interface_mtu: 1500
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
@@
-33,12
+33,12
@@
parameters:
default_min_hwe_kernel: 'hwe-16.04'
subnets:
opnfv_maas_pxe:
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:
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:
type: dynamic
vlans:
untagged: