Restore PR111 changes.

Signed-off-by: Phil Cameron <pcameron@redhat.com>
openshift · Mar 9, 2020 · cefd029 · cefd029
1 parent ca1881e
commit cefd029
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/go-controller/pkg/cluster/cluster.go b/go-controller/pkg/cluster/cluster.go
@@ -57,7 +57,6 @@ func setupOVNNode(node *kapi.Node) error {
 		fmt.Sprintf("external_ids:ovn-openflow-probe-interval=%d",
 			config.Default.OpenFlowProbe),
 		fmt.Sprintf("external_ids:hostname=\"%s\"", nodeName),
-		"external_ids:ovn-monitor-all=true",
 	)
 	if err != nil {
 		return fmt.Errorf("error setting OVS external IDs: %v\n  %q", err, stderr)

diff --git a/go-controller/pkg/cluster/node_test.go b/go-controller/pkg/cluster/node_test.go
@@ -59,8 +59,7 @@ var _ = Describe("Node Operations", func() {
 					"external_ids:ovn-encap-ip=%s "+
 					"external_ids:ovn-remote-probe-interval=%d "+
 					"external_ids:ovn-openflow-probe-interval=%d "+
-					"external_ids:hostname=\"%s\" "+
-					"external_ids:ovn-monitor-all=true",
+					"external_ids:hostname=\"%s\""
 					nodeIP, interval, ofintval, nodeName),
 			})
 
@@ -113,8 +112,7 @@ var _ = Describe("Node Operations", func() {
 					"external_ids:ovn-encap-ip=%s "+
 					"external_ids:ovn-remote-probe-interval=%d "+
 					"external_ids:ovn-openflow-probe-interval=%d "+
-					"external_ids:hostname=\"%s\" "+
-					"external_ids:ovn-monitor-all=true",
+					"external_ids:hostname=\"%s\"",
 					nodeIP, interval, ofintval, nodeName),
 			})
 			fexec.AddFakeCmd(&ovntest.ExpectedCmd{