From 0241c213d489a9e97ad1e473bb073fc1302efbae Mon Sep 17 00:00:00 2001 From: Rajat Chopra Date: Wed, 4 Feb 2015 15:38:27 -0800 Subject: [PATCH] make ovs-simple from openshift-sdn the default networking solution for vagrant --- vagrant/provision-master.sh | 2 +- vagrant/provision-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrant/provision-master.sh b/vagrant/provision-master.sh index 8bd46f857664..2f5acf3a3239 100755 --- a/vagrant/provision-master.sh +++ b/vagrant/provision-master.sh @@ -55,7 +55,7 @@ systemctl enable openshift-master.service systemctl start openshift-master.service # if SDN requires service on master, then set it up -if [ "${OPENSHIFT_SDN}" == "ovs-simple" ]; then +if [ "${OPENSHIFT_SDN}" != "ovs-gre" ]; then $(dirname $0)/provision-master-sdn.sh $@ fi diff --git a/vagrant/provision-minion.sh b/vagrant/provision-minion.sh index 35f656d15581..6ce0e02adb57 100755 --- a/vagrant/provision-minion.sh +++ b/vagrant/provision-minion.sh @@ -32,7 +32,7 @@ pushd /vagrant cp _output/local/go/bin/openshift /usr/bin popd -if [ "${OPENSHIFT_SDN}" == "ovs-simple" ]; then +if [ "${OPENSHIFT_SDN}" != "ovs-gre" ]; then $(dirname $0)/provision-node-sdn.sh $@ else # Setup default networking between the nodes