Merge pull request #19079 from rajatchopra/ovn_gateway

Automatic merge from submit-queue. setup gateway by default for dind-ovn @dcbw PTAL /cc @openshift/networking
openshift · Mar 23, 2018 · 63504cd · 63504cd
2 parents cfb31fc + 4cd4a3c
commit 63504cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/hack/dind-cluster.sh b/hack/dind-cluster.sh
@@ -581,12 +581,6 @@ function copy-ovn-runtime() {
   cp "${ovn_go_controller_built_binaries_path}/ovn-kube-util" "${target}"
   cp "${ovn_go_controller_built_binaries_path}/ovn-k8s-overlay" "${target}"
   cp "${ovn_go_controller_built_binaries_path}/ovn-k8s-cni-overlay" "${target}"
-
-  local ovn_k8s_binaries_path="${ovn_root}/bin"
-  cp "${ovn_k8s_binaries_path}/ovn-k8s-gateway-helper" "${target}"
-
-  local ovn_k8s_python_module_path="${ovn_root}/ovn_k8s"
-  cp -R "${ovn_k8s_python_module_path}" "${target}/"
 }
 
 function wait-for-cluster() {

diff --git a/images/dind/node/ovn-kubernetes-node.sh b/images/dind/node/ovn-kubernetes-node.sh
@@ -58,7 +58,8 @@ EOF
 	--cluster-subnet "${cluster_cidr}" \
 	--nb-address "tcp://${ovn_master_ip}:6641" \
 	--sb-address "tcp://${ovn_master_ip}:6642" \
-	--init-node ${host}
+	--init-node ${host} \
+	--init-gateways
 }
 
 if [[ -n "${OPENSHIFT_OVN_KUBERNETES}" ]]; then