From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 1 Mar 2012 02:41:58 +0000 (-0800)
Subject: xenserver: Always update the bridge ID in ovs-xapi-sync.
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=6899e5418db7a36d85605ed287b1eb1ecf54e736

xenserver: Always update the bridge ID in ovs-xapi-sync.

In some cases we were seeing this column get stale.

Bug #9929.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diagnosed-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 8392c61f0..d5d6bb697 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -280,9 +280,8 @@ def main():
                 # New bridge.
                 update_fail_mode(row)
                 update_in_band_mgmt(row)
-            if new_xnu != old_xnu:
-                # New bridge or bridge's xs-network-uuids has changed.
-                update_bridge_id(row)
+
+            update_bridge_id(row)
             new_bridges[row.name] = new_xnu
         bridges = new_bridges