Added new Vagrantfile for development deployment and installation instructions#589
Merged
tiewei merged 7 commits intocontiv:masterfrom Feb 14, 2018
Merged
Added new Vagrantfile for development deployment and installation instructions#589tiewei merged 7 commits intocontiv:masterfrom
tiewei merged 7 commits intocontiv:masterfrom
Conversation
…structions - Vagrantfile-dev creates a shared environment between contiv/vpp github repo on the host and the VM allowing the developer to build a development contiv/vpp-vswitch image - Vagrantfile-prod is a copy of the original Vagrantfile that was used before for testing. The cluster does not contain shared folders and does not provide with the ability to build development images. - vagrant-up.sh script modified to support different deployement through flags (-d || --dev-env for development environment, -t || --test-env for testing environmnet) - Two scripts added under vagrant/config folder to build, save and load a new contivvpp/vswitch image that reflects changes of the code, across the cluster
jmedved
approved these changes
Feb 14, 2018
tiewei
approved these changes
Feb 14, 2018
Contributor
tiewei
left a comment
tiewei
left a comment
There was a problem hiding this comment.
Approve with some little nits
| end | ||
| end | ||
| end | ||
| end No newline at end of file |
|
|
||
| set -euo pipefail | ||
|
|
||
| docker load < /vagrant/config/vswitch.tar No newline at end of file |
|
|
||
| echo "Building and saving contivvpp/vswitch image..." | ||
| cd /home/vagrant/gopath/src/github.com/contiv/vpp/docker/development; ./build.sh | ||
| docker save contivvpp/vswitch:latest > /vagrant/config/vswitch.tar No newline at end of file |
|
|
||
| if [ -f ../Vagrantfile ] ; then | ||
| rm ../Vagrantfile | ||
| fi No newline at end of file |
| then | ||
| cp ../Vagrantfile-prod ../Vagrantfile | ||
| vagrant up | ||
| fi No newline at end of file |
| if [ "${DEV_ENV}" == "true" ] | ||
| then | ||
| cp ../Vagrantfile-dev ../Vagrantfile | ||
| vagrant up |
Contributor
There was a problem hiding this comment.
you can set VAGRANT_VAGRANTFILE environment variable to point the vagrant file, instead of cp and rm later
VAGRANT_VAGRANTFILE =foobar vagrant up
- Moved config folder under the folder scripts are running - Edited README.md to match new file loactions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR provides support for two different K8s cluster deployments. The testing and the development deployment.