Skip to content

make ovs-simple from openshift-sdn the default networking solution for vagrant #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Feb 5, 2015
Merged

make ovs-simple from openshift-sdn the default networking solution for vagrant #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vagrant/provision-master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion vagrant/provision-minion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down