incusd: Reset OVS as needed

Signed-off-by: Stéphane Graber <[email protected]>
lxc · Aug 27, 2024 · 3ddbdcc · 3ddbdcc
1 parent ab44781
commit 3ddbdcc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/cmd/incusd/api_1.0.go b/cmd/incusd/api_1.0.go
@@ -801,6 +801,7 @@ func doApi10UpdateTriggers(d *Daemon, nodeChanged, clusterChanged map[string]str
 	oidcChanged := false
 	openFGAChanged := false
 	ovnChanged := false
+	ovsChanged := false
 	syslogChanged := false
 
 	for key := range clusterChanged {
@@ -856,6 +857,9 @@ func doApi10UpdateTriggers(d *Daemon, nodeChanged, clusterChanged map[string]str
 
 		case "core.syslog_socket":
 			syslogChanged = true
+
+		case "network.ovs.connection":
+			ovsChanged = true
 		}
 	}
 
@@ -993,6 +997,13 @@ func doApi10UpdateTriggers(d *Daemon, nodeChanged, clusterChanged map[string]str
 		}
 	}
 
+	if ovsChanged {
+		err := d.setupOVS()
+		if err != nil {
+			return err
+		}
+	}
+
 	if syslogChanged {
 		err := d.setupSyslogSocket(nodeConfig.SyslogSocket())
 		if err != nil {

diff --git a/cmd/incusd/api_cluster.go b/cmd/incusd/api_cluster.go
@@ -773,6 +773,9 @@ func clusterPutJoin(d *Daemon, r *http.Request, req api.ClusterPut) response.Res
 		// Refresh the state.
 		s = d.State()
 
+		// Re-connect OVS if needed.
+		_ = d.setupOVS()
+
 		// Re-connect OVN if needed.
 		_ = d.setupOVN()