Merge pull request #10432 from pravisankar/fix-plugin-change

OpenShift Bot · web-flow · commit 58fb5f589a43 · 2016-08-16T11:11:51.000-04:00
Merged by openshift-bot
diff --git a/pkg/sdn/plugin/master.go b/pkg/sdn/plugin/master.go
@@ -129,7 +129,8 @@ func (master *OsdnMaster) isClusterNetworkChanged(curNetwork *NetworkInfo) (bool
 
 	if curNetwork.ClusterNetwork.String() != oldNetwork.ClusterNetwork.String() ||
 		curNetwork.HostSubnetLength != oldNetwork.HostSubnetLength ||
-		curNetwork.ServiceNetwork.String() != oldNetwork.ServiceNetwork.String() {
+		curNetwork.ServiceNetwork.String() != oldNetwork.ServiceNetwork.String() ||
+		curNetwork.PluginName != oldNetwork.PluginName {
 		return true, nil
 	}
 	return false, nil

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,8 @@ func (master OsdnMaster) isClusterNetworkChanged(curNetwork NetworkInfo) (bool`
`129`	`129`
`130`	`130`	`if curNetwork.ClusterNetwork.String() != oldNetwork.ClusterNetwork.String() \|\|`
`131`	`131`	`curNetwork.HostSubnetLength != oldNetwork.HostSubnetLength \|\|`
`132`		`- curNetwork.ServiceNetwork.String() != oldNetwork.ServiceNetwork.String() {`
	`132`	`+ curNetwork.ServiceNetwork.String() != oldNetwork.ServiceNetwork.String() \|\|`
	`133`	`+ curNetwork.PluginName != oldNetwork.PluginName {`
`133`	`134`	`return true, nil`
`134`	`135`	`}`
`135`	`136`	`return false, nil`