Fix issue#2655; bz1225410; rebase openshift-sdn Godeps

openshift · Jun 2, 2015 · be20871 · be20871
1 parent 76d187d
commit be20871
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 63 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/ovssubnet/bin/openshift-ovs-subnet b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/ovssubnet/bin/openshift-ovs-subnet
diff --git a/...e/src/github.com/openshift/openshift-sdn/ovssubnet/bin/openshift-sdn-kube-subnet-setup.sh b/...e/src/github.com/openshift/openshift-sdn/ovssubnet/bin/openshift-sdn-kube-subnet-setup.sh
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/ovssubnet/controller/kube/kube.go b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/ovssubnet/controller/kube/kube.go
diff --git a/pkg/cmd/server/start/start_node.go b/pkg/cmd/server/start/start_node.go
@@ -246,12 +246,11 @@ func StartNode(config configapi.NodeConfig) error {
 		return err
 	}
 
-	RunSDNController(config)
-
 	nodeConfig.EnsureVolumeDir()
 	nodeConfig.EnsureDocker(docker.NewHelper())
 	nodeConfig.RunProxy()
 	nodeConfig.RunKubelet()
+	RunSDNController(config)
 	go daemon.SdNotify("READY=1")
 
 	return nil