starlingx
/
metal
Code Issues Proposed changes

Merge "Change VLAN interface naming scheme"

This commit is contained in:
Zuul 2019-10-17 18:30:09 +00:00 committed by Gerrit Code Review
parent c0e97fcb36 d6ea5446e9
commit 3252f33b65
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bsp-files/kickstarts/post_net_common.cfg
View File

@ -94,7 +94,7 @@ else
# Persist the boot device to the platform configuration. This will get
# overwritten later if the management_interface is on a bonded interface.
echo management_interface=$mgmt_dev.$mgmt_vlan >> /etc/platform/platform.conf
echo management_interface=vlan$mgmt_vlan >> /etc/platform/platform.conf
# Build networking scripts
cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
@ -116,14 +116,15 @@ IPV6_AUTOCONF=no
LINKDELAY=20
EOF
cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$mgmt_dev.$mgmt_vlan
DEVICE=$mgmt_dev.$mgmt_vlan
cat << EOF > /etc/sysconfig/network-scripts/ifcfg-vlan$mgmt_vlan
DEVICE=vlan$mgmt_vlan
BOOTPROTO=dhcp
DHCLIENTARGS=$dhclientargs
IPV6INIT=$ipv6init
DHCPV6C=$dhcpv6c
ONBOOT=yes
IPV6_AUTOCONF=no
PHYSDEV=$mgmt_dev
VLAN=yes
LINKDELAY=20
EOF
@ -136,7 +137,7 @@ EOF
# Bring up the mgmt vlan so that a dhcp lease is acquired and an address is
# setup prior to the post-install reboot. This is so that the timing of the IP
# address allocation is similar to how normal/non-pxe installation works.
mgmt_iface=$mgmt_dev.$mgmt_vlan
mgmt_iface=vlan$mgmt_vlan
dhclient_family=$([[ $mgmt_address_family == "inet" ]] && echo -4 || echo -6)
ip link add link $mgmt_dev name $mgmt_iface type vlan id $mgmt_vlan
ip link set up dev $mgmt_iface