43 Commits

Author SHA1 Message Date
Damjan Marion
48009e4c57 Move vagrant stuff to extras/
Change-Id: I7e3d6ecc3f23d862004c273e23e36e234ceb6015
Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-04-20 12:57:33 +00:00
Dave Wallace
ed0e49c518 Update default Vagrant box to Ubuntu 16.04, VPP-616
- Make puppetlabs/ubuntu-16.04-64-nocm the default box
- Enable x11 forwarding
- Install x11-utils required for emacs to work over X11
- Refactor run.sh
- Add VPP_VAGRANT_POST_BUILD environment variable to
  allow selection of installing VPP or run "make test".
- Fix dependencies in src/vppapigen.am

Change-Id: I0ec054fdc83feb71ca8396df53ed02bf82ecd7e7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2017-02-02 13:42:56 +00:00
Padraig Connolly
46f133d522 vagrant: stop rsync from wiping changes from /vpp
*Fixes issue where any changes to the vpp directory withing vagrant
 are wiped if user reboots the vagrant vm
*Rsync will now only run if provisioning hasn't occured before

Change-Id: Ic29eb1321fba33e82df4075e7a95c96fa2e6739f
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
2017-01-17 16:17:47 +00:00
Ray Kinsella
1a9b5b71cd vagrant: Fixing sudo related vagrant errors
The dpkg sudo trigger appears to want to run interactively despite the noninteractive
debconf setting. This is a problem upstream for vagrant also, see.

https://github.com/hashicorp/terraform/issues/9763

Incorporating the recommended fix to Vagrantfile from upstream

https://github.com/hashicorp/terraform/pull/9783

Change-Id: I8da8522fc9e80fc3bd268b347a786054ad019170
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
2016-12-21 17:05:27 +00:00
Ray Kinsella
ee49bf82f5 vagrant: updated Vagrantfile to use rsync
Replacing problematic nfs & git clone, with a simplier rsync.

Change-Id: I26a95bd81b7fbf6ea0179cd62361e0902f2d22ed
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
2016-12-21 15:46:07 +00:00
Billy McFall
8cb034b397 VPP-504: Permissions Error on Centos Vagrant VPP VM
Change-Id: I5e63538e0ba2395fb13f99f0c7c2ca3123a34e59
Signed-off-by: Billy McFall <bmcfall@redhat.com>
2016-10-22 02:45:04 +00:00
Thomas F Herbert
81ee70f93f VPP-308: Added workaround for failed vnet build. For some reason
the clock slew is greater with Vagrant 1.8.5 which causes Makefile.am to be
timestamped as newer which causes builds to fail.

Change-Id: Id0d35c41ac66a2841c5aae20dd678f4bc125e41b
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2016-09-27 20:48:26 +00:00
Ed Warnicke
3ba4d36d92 VPP-373: stop building from /vpp mount
Change-Id: I7f8fe8fa6c24b4229b0cb45e6c83e7cb2828e2da
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-09-02 02:05:57 +00:00
Thomas F Herbert
7b75d211ae Fix for broken vagrant installs when using Vagrant 1.8.5.
I upgraded Fedora23 which installed kernel 4.6.4 which in turn required
VirtualBox 5.1.2 which in turn required Vagrant 1.8.5.

Workaround for a change in Vagrant 1.8.5 that breaks Centos. The
newer version of Vagrant doesn't chmod the ssh directory before trying to copy
new public key during installs. This will be fixed upstream in Vagrant 1.8.6.
Bug doesn't affect Ubuntu because it uses a different umask whereas Centos uses
0002.

Change-Id: I8108d4cc208fc47fa69f8a5cf27b2bba7e34293e
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2016-08-02 14:20:21 +00:00
Ray
9387e51acb build-root/vagrant: Fix SSE4.x for VB
Number of users are reporting issues using VPP with Vagrant and the
VirtualBox provider. VPP quits complaining that SSE support is not enabled.

This change explicity enables SSE4.x support in the VirtualBox VM.

Change-Id: Ia26dc43276aae4179609febfd705d868fa3e07c6
Signed-off-by: Ray <ray.kinsella@intel.com>
2016-07-21 09:35:14 +00:00
Keith Burns (alagalah)
f8035649e9 Vagrantfile RAM default is too small.
- Will raise JIRA for someone to convert this to use binaries by default
- This means we should be able to get away with smaller VM for non-dev users

Change-Id: If3d9283ba2c169792a1ab71ff692c25de82d41f4
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-06-25 03:50:28 -07:00
Srivatsa Sangli
010972a95d Vagrantfile syntax error correction - requires string input instead of integer.
Change-Id: Ib291662c4ea2f5bef0f2c417b16d256f5c480d5c
Signed-off-by: Srivatsa Sangli<srivrama@cisco.com>
2016-06-21 12:58:19 -07:00
Keith Burns (alagalah)
e0965d4e05 Using env.sh file for Vagrantfile inputs, but assume some defaults
Change-Id: Ia4b45d88be5943d413d61435ff38796d1b6a32a2
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-06-20 12:13:15 +00:00
Dave Wallace
431cd2f150 VPP-112: linux kernel info missing from build log
Change-Id: I343418d409d682b00e74e41236382fdc6b3c780c
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2016-06-05 13:49:40 +00:00
Thomas Monjalon
9d6c0ab311 vagrant: disable automatic update on start
The box update requires an internet connection.
It is better to disable it on vagrant start.
It still can be updated with the manual command:
	vagrant box update

Change-Id: I04e05ea08477bf36f25672c54d0a057d995d4a42
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
2016-06-01 10:26:16 +02:00
Ed Warnicke
a20935192a
Whitespace probe for CI
Change-Id: I3744ee19a21dcea2885aef2800244c93aa19763a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-13 13:49:34 -05:00
Ed Warnicke
beabdf0161 Revert "Whitespace change for testing CI"
This reverts commit cf9b712f57e3e81662e0815bd19ce19583783650.

This reverts gerrit: https://gerrit.fd.io/r/#/c/1078/

Change-Id: I4cf8c238fd81b5dc8bd077bbdd00cf72aef796ed
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-12 04:06:05 +00:00
Ed Warnicke
cf9b712f57 Whitespace change for testing CI
Change-Id: I52bf3c1c8ece08a4b52fce1f34704b944f9c1888
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-12 03:52:59 +00:00
Ed Warnicke
30aff24e10 Small improvement to vagrant file
Change-Id: Ia85ed0ef55cb5da118289667d7b217d8890d487e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-07 12:58:55 +00:00
Ed Warnicke
d6a779c411 Fix for unattended in Makefile
Also works around verify

Change-Id: I79ac470ec3fa9943c3a0913ebfaaf91176eb9a81
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-04 01:50:47 +00:00
Damjan Marion
c5e8681b32 Re-do java-8 handling, add unattended switch to toplevel Makefile
Change-Id: Ifaea353be5b42bb6edbcfa0506d02b721c00e392
Signed-off-by: Damjan Marion <damarion@cisco.com>
2016-05-02 19:35:11 +00:00
Ed Warnicke
efa7f9e6c2 Break out install.sh from build.sh
This is necessary because we are now using
build.sh for CI... and we shouldn't
install packages on CI boxes.

Change-Id: I68f7880dfc75bbc4aa278ab0765a43e3fb899f3d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-05-02 19:25:44 +00:00
Keith Burns (alagalah)
3d5916dee6 VPP-32 Increase # cpus to 2, leave RAM at 4G for virtualbox vagrant users
Change-Id: Ifb40316db96e019d6c14ff6a6e9653579009d4c3
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-05-02 18:55:52 +00:00
Ed Warnicke
d6a0fc5ea6 Break boostrap.sh into pieces
In order to make it easier for folks who have existing
Centos or Ubuntu boxes to utilize the same
'Getting started' scripting that is used in Vagrant,
as well as enable us to use that scripting in CI,
broke up bootstrap.sh into

update.sh - Things like apt-get update
build.sh - Install any dependencies and build vpp
clearinterfaces.sh - Clean off any non-default gateway
                   interfaces.  Used by vagrant.
run.sh - Start vpp as a service on the box.

A user (or CI) just wanting to get going and build
on an existing Ubuntu or Centos image (ie, not via
vagrant) can simply run

build.sh

Change-Id: I8f19342f163cad07c6c05def943a5fb8e394b879
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-04-25 17:27:09 +00:00
Srivatsa Sangli
0777915b2a ubuntu 16.04 build support. Supporting systemd with vpp.service files.
Incorporating review comments : modified debian/control dependencies

Change-Id: Ib2fe85d81eb7f1803ef8f54294c7c18cd07c61ba
Signed-off-by: Srivatsa Sangli <srivrama@cisco.com>
2016-04-20 18:44:41 +00:00
Jeff Shaw
ecec279029 vagrant: libvirt configuration.
Configure the proxy, vcpu, and memory parameters for the libvirt provider.

Change-Id: Id662e60f76b4b424d3a5d98929a44ef2587ef258
Signed-off-by: Jeff Shaw <jeffrey.b.shaw@intel.com>
2016-04-11 21:02:00 +00:00
Ed Warnicke
7c38f1ff14 Migrate bootstrap.ubuntu.sh to using top level Makefile
This script moves to using the top level Makefile
in vagrant.

The reason for not merging yet is to make sure that we
don't put the training at risk.  The patch should
be fine (its been tested), but better safe than sorry.

Change-Id: Ic57cfe1f26867c820784e5511d418e68f24b5fcd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-04-09 03:09:51 +00:00
Ed Warnicke
31854abeb9
Fix to centos vagrant file
Change-Id: I5ceae4354c029cb92527b2eeb1a71b76dc2b0311
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-03-29 08:27:30 -05:00
Ed Warnicke
c841eac773 Fix vagrant centos flavor to work with top level make file
Change-Id: I89044ed27130a036536ed33aba847034ed15ad7d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-03-25 20:37:28 +00:00
Keith Burns (alagalah)
525d5957f0 Add GDB and GDB Server to bootstrap files
Validated following images used do not contain gdb, gdbserver:
puppetlabs/centos-7.0-64-nocm
puppetlabs/ubuntu-14.04-64-nocm

Note that centos7 does not include emacs

Change-Id: I091a64a7c667e081574763537de724f9feaae0dc
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-02-19 06:52:26 +01:00
Dave Wallace
efe710fe56 Remove redundant apt-get install of dkms and debhelper.
Change-Id: Id2caea331f86a71f26990e1ae11288826157e737
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2016-02-04 13:13:21 +00:00
Dave Wallace
d255ee13f5 Change non-default route ethernet interfaces state to down so VPP will use them.
Change-Id: Icdb1a8d35a97e01d5e1be13fdc89ce3f9ec62e1a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2016-02-04 13:13:21 +00:00
Ed Warnicke
eeee9e2b18 Switched vagrant for ~/git/vpp to /vpp
build-root/vagrant/Vagrantfile

was always mounting the vpp into /vpp
Now rather than cloning it and building,
we just use it as mounted.

In order to let folks know what happened,
a README.moved is copied into the ~/git/vpp
so folks know what happened.

In addition to make it easier for folks
to do commits from withing the vagrant,
we install git-review, and copy in the
users .gitconfig and .gnupg directory.

A couple of notes about this. VMWare goes much
much faster in all cases.  Virtualbox is a
bit slower in the very first run (without ccache).

One of the benefits of using the mounted /vpp though
is that after your first vagrant up, you always
have access to the .ccache, as it lives
outside the vagrant, and so in steady state
everything is faster.

Change-Id: I2cd2c28181b3d7e664240dfe2249b5be3f1b9241
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-02-03 14:49:37 +00:00
Dave Barach
f1bb047ae8 Add pciutils to the CentOS vagrant bootstrap; needed to install vpp rpms
Change-Id: Ia0cbf88a509392c1bd75fb242985da07c8356739
Signed-off-by: Dave Barach <dave@barachs.net>
2016-02-02 16:59:21 -05:00
Dave Barach
b10277dedc Enable ganglia module integration build
Change-Id: Ia49e9f246e8318ba74195c3397472fb0c102389b
Signed-off-by: Dave Barach <dave@barachs.net>
2016-02-02 21:36:00 +00:00
Keith Burns (alagalah)
d5201c8007 Changes to Centos bootstrap to remove ~/git/vpp if it exists before attempting clone
- fixes issue with vagrant reload --provision not updating clone of clone

Change-Id: I506d4cbca90b30bf787c1be7e4ad39d748ea7f5b
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-02-01 03:42:12 +00:00
Keith Burns (alagalah)
f5a857d52c Vagrantfile doesn't rm git/vpp and vagrant reload --provision
result is not expected. ie don't get updates

- only applied ubuntu changes in this patch.

Change-Id: I194f5120734d63f1b815f86bb510f0c0981dd89b
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
2016-02-01 03:18:56 +00:00
Dave Barach
c23f7bc9a1 vpp metrics upload via gmond plugin
The gmond module (gmod) isn't built by default, pending CentOS
packaging work.

Change-Id: I78493a60f431cf9924a28d31ba29423a03aa79b3
Signed-off-by: Dave Barach <dave@barachs.net>
2016-01-28 09:36:20 -05:00
Vincent JARDIN
1d3be19c77 build - Vagrant template to get more emulated PCI NICs
For some testing, it an be usefull to have more physical
NICS that DPDK's PMDs can bind to.
Example to run vpp within a VM with 3 emulated NICs:
  export VPP_VAGRANT_NICS=3
  vagrant up

Change-Id: I82d70f21c0a9ceba126ab6620c3b869d590d8de1
Signed-off-by: Vincent JARDIN <vincent.jardin@6wind.com>
2016-01-18 13:25:08 +00:00
Matt Johnson
3b566bb613 Fix vagrant grub issue with ubuntu & virtualbox
Change-Id: I8ff952a02c9c51070c41bdca72fb4f7ed8a7c8ba
Signed-off-by: Matt Johnson <matjohn2@cisco.com>
2016-01-11 14:29:59 -08:00
Ed Warnicke
b463ec886b
Update vagrant/ to install vpp packages and use vppctl
Change-Id: I30f0cb52152bed174fa82a09fb8584c193df4d2c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2015-12-22 20:04:54 -07:00
Ed Warnicke
b73f2675c7
Fix to make it easy to use http proxy with Vagrant
Many thanks to Keith Burns for the suggestion.

Change-Id: Iae52c8afd43357e955825fbafbad057c0e6a97c7
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2015-12-14 16:08:45 -07:00
Ed Warnicke
cb9cadad57 Initial commit of vpp code.
Change-Id: Ib246f1fbfce93274020ee93ce461e3d8bd8b9f17
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2015-12-08 15:47:27 -07:00