From 717bee352dc53c990e3dfbe2fa655a35afc617ef Mon Sep 17 00:00:00 2001 From: Nir Magnezi Date: Thu, 27 Apr 2017 15:32:07 +0300 Subject: [PATCH] Devstack plugin should mark the HM ovs port for cleanup skip The Octavia Devstack plugin change should reflect the issue mentioned in: If483d0ee027596999370ab0d21b1743d4ef16acb Related-Bug: #1685223 Change-Id: Ia1f728081a589b0848c699836c22841c29b0f6da Depends-On: If483d0ee027596999370ab0d21b1743d4ef16acb --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index dccb70530e..ff61978599 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -286,7 +286,7 @@ function create_mgmt_network_interface { # TODO(johnsom) This gets the IPv4 address, should be updated for IPv6 MGMT_PORT_IP=$(openstack port show -f value -c fixed_ips $MGMT_PORT_ID | awk '{FS=",| "; gsub(",",""); gsub("'\''",""); for(i = 1; i <= NF; ++i) {if ($i ~ /^ip_address/) {n=index($i, "="); if (substr($i, n+1) ~ "\\.") print substr($i, n+1)}}}') if [[ $Q_AGENT == "openvswitch" ]]; then - sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} o-hm0 -- set Interface o-hm0 type=internal -- set Interface o-hm0 external-ids:iface-status=active -- set Interface o-hm0 external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface o-hm0 external-ids:iface-id=$MGMT_PORT_ID + sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} o-hm0 -- set Interface o-hm0 type=internal -- set Interface o-hm0 external-ids:iface-status=active -- set Interface o-hm0 external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface o-hm0 external-ids:iface-id=$MGMT_PORT_ID -- set Interface o-hm0 external-ids:skip_cleanup=true elif [[ $Q_AGENT == "linuxbridge" ]]; then if ! ip link show o-hm0 ; then sudo ip link add o-hm0 type veth peer name o-bhm0