From e81d21cc76b5bc90c7bab0c7f82a6fa16bbcf1bc Mon Sep 17 00:00:00 2001 From: Revital Aronis Date: Wed, 15 Mar 2017 17:06:04 +0200 Subject: [PATCH] Add vlan interface to the gateway Change-Id: I308cbd0273d7d5e016f45657bdc7f04c9b09042b Signed-off-by: Revital Aronis Signed-off-by: Jamo Luhrsen --- .../include-raw-integration-deploy-openstack-run-test.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index bf0fc2ce4..8dee106f2 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -190,8 +190,8 @@ cat >> ${local_conf_file_name} << EOF minimize_polling=True [ml2] -# Needed for VLAN provider tests - because our provider networks are always encapsulated in VXLAN (br-physnet1) -# MTU(1440) + VXLAN(50) + VLAN(4) = 1494 < MTU eth0/br-physnet1(1500) +# Needed for VLAN provider tests - because our provider networks are always encapsulated in VXLAN (br-phys1) +# MTU(1440) + VXLAN(50) + VLAN(4) = 1494 < MTU eth0/br-phys1(1500) physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1440 [[post-config|/etc/neutron/dhcp_agent.ini]] @@ -670,7 +670,9 @@ done # Control Node - PUBLIC_BRIDGE will act as the external router GATEWAY_IP="10.10.10.250" # FIXME this should be a parameter, also shared with integration-test -${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo ifconfig $PUBLIC_BRIDGE up ${GATEWAY_IP}/24" +${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.167 type vlan id 167" +${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo ifconfig ${PUBLIC_BRIDGE} up" +${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo ifconfig ${PUBLIC_BRIDGE}.167 up ${GATEWAY_IP}/24" compute_index=1 for compute_ip in ${COMPUTE_IPS[*]} do -- 2.36.6