Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "states: maas: Dynamic node count in stop condition"
[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
bdf7fea
..
4e9ed2f
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
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+
- system.linux.system.repo.saltstack.xenial
+
- system.maas.region.single
+
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
_param:
dhcp_interface: ens3
primary_interface: ens4
pxe_interface: ens5
parameters:
_param:
dhcp_interface: ens3
primary_interface: ens4
pxe_interface: ens5
- external_interface: ens6
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
@@
-32,13
+32,13
@@
parameters:
network_discovery: 'enabled'
default_min_hwe_kernel: 'hwe-16.04'
subnets:
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:
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:
type: dynamic
vlans:
untagged:
@@
-125,11
+125,3
@@
parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
type: eth
address: ${_param:single_address}
netmask: 255.255.255.0
type: eth
- external_interface:
- enabled: true
- name: ${_param:external_interface}
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:infra_maas_node01_external_address}
- netmask: 255.255.255.0
- type: eth