Merge pull request #115 from pecameron/revertf21e6316

Revert "WIP: test monitor-all fix"

Dockerfile

@@ -42,12 +42,6 @@ RUN INSTALL_PKGS=" \
 	yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
 	yum clean all && rm -rf /var/cache/*
 
-RUN curl -O http://people.redhat.com/dcbw/ovn2.12-2.12.0-32.el7fdn.x86_64.rpm && \
-	curl -O http://people.redhat.com/dcbw/ovn2.12-central-2.12.0-32.el7fdn.x86_64.rpm && \
-	curl -O http://people.redhat.com/dcbw/ovn2.12-host-2.12.0-32.el7fdn.x86_64.rpm && \
-	rpm -Uhv --nodeps --force ovn2.12-*2.12.0-32*.rpm && \
-	rm -f *.rpm
-
 RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /var/run/ovn && \
     mkdir -p /etc/cni/net.d && \

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)

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{