Skip to content

Commit 7b8ac56

Browse files
authored
lxd: BGP fixes (from Incus) (#15205)
Includes cherry-picks from lxc/incus#1805.
2 parents 608d63b + 752dd33 commit 7b8ac56

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

lxd/bgp/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func (s *Server) stop() error {
158158
oldPeers[peerUUID] = peer
159159
}
160160

161-
// Remove all the peers (ignore failures).
161+
// Remove all the peers.
162162
for _, peer := range s.peers {
163163
err := s.removePeer(peer.address)
164164
if err != nil {

lxd/network/driver_ovn.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -3503,12 +3503,12 @@ func (n *ovn) Update(newNetwork api.NetworkPut, targetNode string, clientType re
35033503
if err != nil {
35043504
return err
35053505
}
3506-
}
3507-
3508-
// Setup BGP.
3509-
err = n.bgpSetup(oldNetwork.Config)
3510-
if err != nil {
3511-
return err
3506+
} else {
3507+
// Setup BGP.
3508+
err = n.bgpSetup(oldNetwork.Config)
3509+
if err != nil {
3510+
return err
3511+
}
35123512
}
35133513

35143514
revert.Success()

lxd/network/driver_physical.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,16 @@ func (n *physical) Update(newNetwork api.NetworkPut, targetNode string, clientTy
491491
return err
492492
}
493493

494-
err = n.setup(oldNetwork.Config)
495-
if err != nil {
496-
return err
494+
if !hostNameChanged {
495+
err = n.setup(oldNetwork.Config)
496+
if err != nil {
497+
return err
498+
}
499+
} else {
500+
err = n.setup(nil)
501+
if err != nil {
502+
return err
503+
}
497504
}
498505

499506
revert.Success()

0 commit comments

Comments
 (0)