diff --git a/multi-node-aio/playbooks/group_vars/dhcp_hosts.yml b/multi-node-aio/playbooks/group_vars/dhcp_hosts.yml index 19419853..79e3ca19 100644 --- a/multi-node-aio/playbooks/group_vars/dhcp_hosts.yml +++ b/multi-node-aio/playbooks/group_vars/dhcp_hosts.yml @@ -20,7 +20,7 @@ dhcp_list: gateway: 10.0.2.1 # Gateway dns: 8.8.8.8 # DNS subnet: 10.0.0.0 # Subnet mask - range_start: 10.0.2.3 # Start of DHCP range + range_start: 10.0.2.160 # Start of DHCP range range_end: 10.0.3.254 # End of DHCP range broadcast: 10.0.3.255 # Network Broadcast address default_lease_time: 21600 # Subnet Default lease time - The default is used if this is not defined diff --git a/multi-node-aio/playbooks/pxe/configs/debian/vm-bridges.cfg.j2 b/multi-node-aio/playbooks/pxe/configs/debian/vm-bridges.cfg.j2 index 3505172a..2a622bed 100644 --- a/multi-node-aio/playbooks/pxe/configs/debian/vm-bridges.cfg.j2 +++ b/multi-node-aio/playbooks/pxe/configs/debian/vm-bridges.cfg.j2 @@ -16,7 +16,7 @@ iface br-{{ key }} inet {{ value.inet_type }} bridge_waitport 10 bridge_fd 0 offload-sg off -{% if value.iface is defined %} +{% if value.iface is defined and key == "flat" %} pre-up ip link add br-veth-{{ key }} type veth peer name v{{ value.iface }} || true # Set both ends UP pre-up ip link set br-veth-{{ key }} up @@ -24,6 +24,8 @@ iface br-{{ key }} inet {{ value.inet_type }} # Delete veth pair on DOWN post-down ip link del br-vlan-veth || true bridge_ports {{ value.iface }} br-veth-{{ key }} +{% elif value.iface is defined %} + bridge_ports {{ value.iface | default('none') }} {% else %} bridge_ports none {% endif %}