Skip to content

Commit 7e108eb

Browse files
committed
CA-223508: Don't create/destroy the OVS port for the proxy daemon
This needs to happen in xapi, before it calls configure_site. Signed-off-by: Rob Hoes <[email protected]>
1 parent 6b14b44 commit 7e108eb

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

scripts/setup-pvs-proxy-rules

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ TYPE=$2
1515
PVS_VM_INTERFACE=$3
1616
PRIVATE_PATH=$4
1717

18-
IP=/usr/sbin/ip
1918
VSCTL=/usr/bin/ovs-vsctl
2019
OFCTL=/usr/bin/ovs-ofctl
2120
XSREAD=/usr/bin/xenstore-read
@@ -86,11 +85,6 @@ PVS_RULE_PRIO=1000
8685

8786
case $ACTION in
8887
add)
89-
# Create a port/interface for the proxy daemon
90-
$VSCTL --may-exist add-port "$PVS_BRIDGE" "$PVS_PROXY_INTERFACE" -- set interface "$PVS_PROXY_INTERFACE" type=internal
91-
$IP link set "$PVS_PROXY_INTERFACE" up
92-
logger -t "$LOG_TAG" "Created proxy port $PVS_PROXY_INTERFACE"
93-
9488
PVS_PROXY_MAC=$($VSCTL get interface "$PVS_PROXY_INTERFACE" mac_in_use | tr -d '"')
9589
PVS_PROXY_OFPORT=$($VSCTL get interface "$PVS_PROXY_INTERFACE" ofport)
9690
PVS_VM_OFPORT=$($VSCTL get interface "$PVS_VM_INTERFACE" ofport)
@@ -199,11 +193,6 @@ case $ACTION in
199193
# Again, don't do the following when a tap goes away, because
200194
# vif may still be there.
201195

202-
# Remove the port/interface for the proxy daemon
203-
$IP link set "$PVS_PROXY_INTERFACE" down
204-
$VSCTL del-port "$PVS_BRIDGE" "$PVS_PROXY_INTERFACE"
205-
logger -t "$LOG_TAG" "Removed proxy port $PVS_PROXY_INTERFACE"
206-
207196
# Announce that on the OVS we have removed the rules for this VIF's pvs-proxy.
208197
XSRM "${PRIVATE_PATH}/pvs-rules-active"
209198
fi

0 commit comments

Comments
 (0)