From 862937c477a3d90798a5e4c4e84fc7c79aae52fe Mon Sep 17 00:00:00 2001 From: Ben Magistro Date: Sun, 17 Apr 2022 08:46:57 -0400 Subject: Drop vagrant Vagrant is not actively tested and is utilizing very old distributions that are no longer supported. Signed-off-by: Ben Magistro Change-Id: I127b0242468328c71146ccddb6ec2f7a13d33a6c --- .gitignore | 1 - vagrant/Vagrantfile | 76 ----------------------------------------------------- vagrant/build.sh | 36 ------------------------- vagrant/update.sh | 45 ------------------------------- 4 files changed, 158 deletions(-) delete mode 100644 vagrant/Vagrantfile delete mode 100755 vagrant/build.sh delete mode 100755 vagrant/update.sh diff --git a/.gitignore b/.gitignore index 1c0bae7..6e6dd31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ dpdk/_build/ dpdk/dpdk-*.tar.gz x86_64-native-linuxapp-gcc/ -.vagrant .project .idea .cproject diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile deleted file mode 100644 index 28019e1..0000000 --- a/vagrant/Vagrantfile +++ /dev/null @@ -1,76 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - - # Pick the right distro and bootstrap, default is ubuntu1404 - distro = ENV['VPP_VAGRANT_DISTRO'] - if distro == 'centos7' - config.vm.box = "puppetlabs/centos-7.2-64-nocm" - else - config.vm.box = "puppetlabs/ubuntu-14.04-64-nocm" - end - config.vm.box_check_update = false - - config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"update.sh") - config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/tldk vagrant" - - # Add .gnupg dir in so folks can sign patches - # Note, as gnupg puts socket files in that dir, we have - # to be cautious and make sure we are dealing with a plain file - homedir = File.expand_path("~/") - Dir["#{homedir}/.gnupg/**/*"].each do |fname| - if File.file?(fname) - destname = fname.sub(Regexp.escape("#{homedir}/"),'') - config.vm.provision "file", source: fname, destination: destname - end - end - - # Copy in the .gitconfig if it exists - if File.file?(File.expand_path("~/.gitconfig")) - config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig" - end - - # vagrant-cachier caches apt/yum etc to speed subsequent - # vagrant up - # to enable, run - # vagrant plugin install vagrant-cachier - # - if Vagrant.has_plugin?("vagrant-cachier") - config.cache.scope = :box - end - - # Define some physical ports for your VMs to be used by DPDK - nics = 2 - if ENV.key?('VPP_VAGRANT_NICS') - nics = ENV['VPP_VAGRANT_NICS'].to_i(10) - end - for i in 1..nics - config.vm.network "private_network", type: "dhcp" - end - - # use http proxy if avaiable - if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf") - config.proxy.http = ENV['http_proxy'] - config.proxy.https = ENV['https_proxy'] - config.proxy.no_proxy = "localhost,127.0.0.1" - end - - config.vm.synced_folder "../", "/tldk", disabled: false - config.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--ioapic", "on"] - vb.memory = 4096 - vb.cpus = 2 - end - config.vm.provider "vmware_fusion" do |fusion,override| - fusion.vmx["memsize"] = "4096" - end - config.vm.provider "libvirt" do |lv| - lv.memory = 4096 - lv.cpus = 8 - end - config.vm.provider "vmware_workstation" do |vws,override| - vws.vmx["memsize"] = "8192" - vws.vmx["numvcpus"] = "4" - end -end diff --git a/vagrant/build.sh b/vagrant/build.sh deleted file mode 100755 index 8b06c48..0000000 --- a/vagrant/build.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Get Command Line arguements if present -SRC_DIR=$1 -if [ "x$1" != "x" ]; then - SRC_DIR=$1 -else - SRC_DIR=`dirname $0`/../../ -fi - -if [ "x$2" != "x" ]; then - SUDOCMD="sudo -H -u $2" -fi -echo 0:$0 -echo 1:$1 -echo 2:$2 -echo SRC_DIR: $SRC_DIR -echo SUDOCMD: $SUDOCMD - -# Figure out what system we are running on -if [ -f /etc/lsb-release ];then - . /etc/lsb-release -elif [ -f /etc/redhat-release ];then - sudo yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` -fi -echo DISTRIB_ID: $DISTRIB_ID -echo DISTRIB_RELEASE: $DISTRIB_RELEASE -echo DISTRIB_CODENAME: $DISTRIB_CODENAME -echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION - - - diff --git a/vagrant/update.sh b/vagrant/update.sh deleted file mode 100755 index 77bf49a..0000000 --- a/vagrant/update.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# Make sure that we get the hugepages we need on provision boot -# Note: The package install should take care of this at the end -# But sometimes after all the work of provisioning, we can't -# get the requested number of hugepages without rebooting. -# So do it here just in case -sysctl -w vm.nr_hugepages=1024 -HUGEPAGES=`sysctl -n vm.nr_hugepages` -if [ $HUGEPAGES != 1024 ]; then - echo "ERROR: Unable to get 1024 hugepages, only got $HUGEPAGES. Cannot finish." - exit -fi - -# Figure out what system we are running on -if [ -f /etc/lsb-release ];then - . /etc/lsb-release -elif [ -f /etc/redhat-release ];then - yum install -y redhat-lsb - DISTRIB_ID=`lsb_release -si` - DISTRIB_RELEASE=`lsb_release -sr` - DISTRIB_CODENAME=`lsb_release -sc` - DISTRIB_DESCRIPTION=`lsb_release -sd` -fi - -# Do initial setup for the system -if [ $DISTRIB_ID == "Ubuntu" ]; then - # Fix grub-pc on Virtualbox with Ubuntu - export DEBIAN_FRONTEND=noninteractive - - # Standard update + upgrade dance - apt-get update - apt-get upgrade -y - - # Fix the silly notion that /bin/sh should point to dash by pointing it to bash - - update-alternatives --install /bin/sh sh /bin/bash 100 - - # Install useful but non-mandatory tools - apt-get install -y emacs git-review gdb gdbserver -elif [ $DISTRIB_ID == "CentOS" ]; then - # Standard update + upgrade dance - yum check-update - yum update -y -fi \ No newline at end of file -- cgit 1.2.3-korg