Add veth-vbmc additional veth pair for ironic
Related-Prod: PRODX-4769
Change-Id: I8a06533ed4c7dfdfd1c480e926873f979be3af47
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 24b4dad..21e23be 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -358,10 +358,20 @@
Name=veth-bm-br
EOF
+cat << EOF > /etc/systemd/network/12-veth-vbmc.netdev
+[NetDev]
+Name=veth-vbmc
+Kind=veth
+[Peer]
+Name=veth-vbmc-br
+EOF
+
sed -i 's/.*ethernets:.*/&\n veth-phy: {}/' ${cloud_netplan_cfg}
sed -i 's/.*ethernets:.*/&\n veth-br: {}/' ${cloud_netplan_cfg}
sed -i 's/.*ethernets:.*/&\n veth-bm: {}/' ${cloud_netplan_cfg}
sed -i 's/.*ethernets:.*/&\n veth-bm-br: {}/' ${cloud_netplan_cfg}
+ sed -i 's/.*ethernets:.*/&\n veth-vbmc: {}/' ${cloud_netplan_cfg}
+ sed -i 's/.*ethernets:.*/&\n veth-vbmc-br: {}/' ${cloud_netplan_cfg}
public_address_match_ip_line=$(grep -nm1 "${PUBLIC_NODE_IP_ADDRESS}/${PUBLIC_NODE_IP_NETMASK}" ${cloud_netplan_cfg} | cut -d: -f1)
sed -i "$((${public_address_match_ip_line}-1)),$((${public_address_match_ip_line}))d" ${cloud_netplan_cfg}
@@ -384,6 +394,7 @@
interfaces:
- ${IRONIC_BAREMETAL_INTERFACE}
- veth-bm-br
+ - veth-vbmc-br
addresses:
- ${IRONIC_BAREMETAL_INTERFACE_IP}/${IRONIC_BAREMETAL_NETWORK_NETMASK}
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index a227e09..8f40a87 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -120,7 +120,11 @@
ironic_baremetal_network_interface:
type: string
default: 'veth-bm'
- description: 'The name of interface that should be added to ovs bridge with taps from vbms VMs.'
+ description: 'The name of interface that should be added to ovs bridge in Neutron'
+ ironic_baremetal_network_vbmc_interface:
+ type: string
+ default: 'veth-vbmc'
+ description: 'The name of interface that should be added to ovs bridge with virtualbmc VMs.'
ironic_baremetal_provisioning_interface:
type: string
default: 'br-baremetal'
@@ -645,6 +649,8 @@
value: { get_param: ironic_baremetal_network_pool_end }
ironic_baremetal_network_interface:
value: { get_param: ironic_baremetal_network_interface }
+ ironic_baremetal_network_vbmc_interface:
+ value: { get_param: ironic_baremetal_network_vbmc_interface }
ironic_baremetal_provisioning_interface:
value: { get_param: ironic_baremetal_provisioning_interface }
tunnel_interface: