summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-08-19 16:56:57 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-08-19 17:05:43 +0200
commitb47d696bf3bd5640f44b43cdb12688dc19a0b5d7 (patch)
treebb0897c3590535664cf7e5ee65662ef7ca927779
parent0ce0fa21ea0ae4f6e2b56546a8275901f9cf8196 (diff)
Remove vagrant scripts
Scripts were not updated for a long time, and are not actually needed. VPP vagrant scripts can be used instead. Honeycomb build needs only mvn and Java8. Change-Id: Icba286793fad4780f3ee1a3565a15b303146c82f Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--vagrant-demo/Vagrantfile211
-rw-r--r--vagrant-demo/bootstrap-host.ubuntu1404.sh29
-rwxr-xr-xvagrant-demo/ncmount.sh35
-rwxr-xr-xvagrant-demo/scripts/host1-cfg.sh23
-rwxr-xr-xvagrant-demo/scripts/host2-cfg.sh23
-rwxr-xr-xvagrant-demo/scripts/vbd-reset.sh57
-rwxr-xr-xvagrant-demo/scripts/vpp1-reset.sh95
-rwxr-xr-xvagrant-demo/scripts/vpp2-reset.sh105
-rw-r--r--vagrant/Vagrantfile119
-rw-r--r--vagrant/bootstrap.centos7.sh46
-rw-r--r--vagrant/bootstrap.ubuntu1404.sh312
-rw-r--r--vagrant/settings.xml108
12 files changed, 0 insertions, 1163 deletions
diff --git a/vagrant-demo/Vagrantfile b/vagrant-demo/Vagrantfile
deleted file mode 100644
index 2892b954d..000000000
--- a/vagrant-demo/Vagrantfile
+++ /dev/null
@@ -1,211 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-#
-# Vagrantfile to set up demo VMs and network connections
-#
-# Note: VirtualBox is currently the only provier supported for the demo.
-#
-# [ host1 VM ] <=== Internal Network "host1-vpp1" ===> [ vpp1 VM ]
-# [ vpp1 VM ] <==+ Internal Network "vpp1-vpp2" ===> [ vpp2 VM ]
-# [ jaws VM ] <==+
-# [ vpp1 VM ] <--- Private Network 192.168.10.x -+--> [ vbd VM ]
-# (Mgmt network) |
-# +--> [ vpp2 VM ]
-# [ vpp2 VM ] <=== Internal Network "host2-vpp2" ===> [ host2 VM ]
-#
-Vagrant.configure(2) do |config|
-
- config.ssh.forward_x11 = true
-
- # 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 vpp1 VM, L3 mgmt interface (eth1) to vbd and vpp2 VMs,
- # L2 interface (GigabitEthernet0/9/0) to host1, and
- # L2 interface (GigabitEthernet0/a/0) to vpp2
- #
- # [ vpp1 VM ] <-- Private Network 192.168.10.x -+-> [ vbd VM ]
- # (Mgmt network) |
- # +-> [ vpp2 VM ]
- # [ host1 VM ] <== Internal Network "host1-vpp1" ==> [ vpp1 VM ]
- # [ vpp1 VM ] <== Internal Network "vpp1-vpp2" ==> [ vpp2 VM ]
- #
- config.vm.define :vpp1 do |vpp1|
- vpp1.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- # Mount karaf packages directory if specified
- if ENV.key?('KARAF_PACKAGES')
- vpp1.vm.synced_folder ENV['KARAF_PACKAGES'], "/karaf-packages", disabled: false
- end
- # Mount Maven repository if specified
- if ENV.key?('HONEYCOMB_M2_REPO')
- vpp1.vm.synced_folder ENV['HONEYCOMB_M2_REPO'], "/m2-repository", disabled: false
- end
- # Mount VPP repository if specified
- if ENV.key?('VPP_REPO')
- vpp1.vm.synced_folder ENV['VPP_REPO'], "/vpp", disabled: false
- end
- vpp1.vm.synced_folder "../", "/honeycomb", disabled: false
- vagrant_vpp_agent_addr = "192.168.10.11"
- vpp1.vm.network "private_network", ip: "#{vagrant_vpp_agent_addr}"
- vpp1.vm.provider "virtualbox" do |vb|
- vb.customize ["modifyvm", :id, "--nic3", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet3", "host1-vpp1"]
- vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
- vb.customize ["modifyvm", :id, "--nic4", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet4", "vpp1-vpp2"]
- vb.customize ["modifyvm", :id, "--nicpromisc4", "allow-all"]
- vb.memory = "4096"
- end
- vpp1.vm.provision 'shell' do | s|
- s.path = "../vagrant/bootstrap.ubuntu1404.sh"
- s.args = ["vpp1", "is_vpp_agent", "#{vagrant_vpp_agent_addr}"]
- end
-end
-
- # Define vpp2 VM, L3 mgmt interface (eth1) to vbd and vpp1 VMs,
- # L2 interface (GigabitEthernet0/9/0) to host1, and
- # L2 interface (GigabitEthernet0/a/0) to vpp1
- #
- # [ vpp1 VM ] <-- Private Network 192.168.10.x -+-> [ vbd VM ]
- # (Mgmt network) |
- # +-> [ vpp2 VM ]
- # [ vpp2 VM ] <== Internal Network "host2-vpp2" ==> [ host2 VM ]
- # [ vpp1 VM ] <== Internal Network "vpp1-vpp2" ==> [ vpp2 VM ]
- #
- config.vm.define :vpp2 do |vpp2|
- # TODO: Run centos on vpp2 VM
- # vpp2.vm.box = "puppetlabs/centos-7.0-64-nocm"
- vpp2.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- # Mount karaf packages directory if specified
- if ENV.key?('KARAF_PACKAGES')
- vpp2.vm.synced_folder ENV['KARAF_PACKAGES'], "/karaf-packages", disabled: false
- end
- # Mount Maven repository if specified
- if ENV.key?('HONEYCOMB_M2_REPO')
- vpp2.vm.synced_folder ENV['HONEYCOMB_M2_REPO'], "/m2-repository", disabled: false
- end
- # Mount VPP repository if specified
- if ENV.key?('VPP_REPO')
- vpp2.vm.synced_folder ENV['VPP_REPO'], "/vpp", disabled: false
- end
- vpp2.vm.synced_folder "../", "/honeycomb", disabled: false
- vagrant_vpp_agent_addr = "192.168.10.12"
- vpp2.vm.network "private_network", ip: "#{vagrant_vpp_agent_addr}"
- vpp2.vm.provider "virtualbox" do |vb|
- vb.customize ["modifyvm", :id, "--nic3", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet3", "host2-vpp2"]
- vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
- vb.customize ["modifyvm", :id, "--nic4", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet4", "vpp1-vpp2"]
- vb.customize ["modifyvm", :id, "--nicpromisc4", "allow-all"]
- vb.memory = "4096"
- end
- vpp2.vm.provision 'shell' do | s|
- s.path = "../vagrant/bootstrap.ubuntu1404.sh"
- s.args = ["vpp2", "is_vpp_agent", "#{vagrant_vpp_agent_addr}"]
- end
- end
-
- # Define vbd VM and L3 mgmt interface (eth1) to vpp1 and vpp2 VMs
- #
- # [ vpp1 VM ] <-- Private Network 192.168.10.x -+-> [ vbd VM ]
- # (Mgmt network) |
- # +-> [ vpp2 VM ]
- #
- config.vm.define :vbd do |vbd|
- vbd.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- # Mount karaf packages directory if specified
- if ENV.key?('KARAF_PACKAGES')
- vbd.vm.synced_folder ENV['KARAF_PACKAGES'], "/karaf-packages", disabled: false
- end
- # Mount Maven repository if specified
- if ENV.key?('HONEYCOMB_M2_REPO')
- vbd.vm.synced_folder ENV['HONEYCOMB_M2_REPO'], "/m2-repository", disabled: false
- end
- vbd.vm.synced_folder "../", "/honeycomb", disabled: false
- vbd.vm.network "private_network", ip: "192.168.10.10"
- vbd.vm.provider "virtualbox" do |vb|
- vb.memory = "2048"
- end
- vbd.vm.provision 'shell' do | s|
- s.path = "../vagrant/bootstrap.ubuntu1404.sh"
- s.args = ["vbd", "is_vbd_vm", ""]
- end
- end
-
- # Define host1 VM and L2 interface (eth1) to vpp1 VM
- #
- # [ host1 VM ] <== Internal Network "host1-vpp1" ==> [ vpp1 VM ]
- #
- config.vm.define :host1 do |host1|
- host1.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- host1.vm.provider "virtualbox" do |vb|
- vb.customize ["modifyvm", :id, "--nic2", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet2", "host1-vpp1"]
- vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
- end
- host1.vm.provision "shell" do |s|
- s.path = "bootstrap-host.ubuntu1404.sh"
- s.args = ["host1", "172.16.15.14/24"]
- end
- end
-
- # Define host2 VM and L2 interface (eth1) to vpp2 VM
- #
- # [ vpp2 VM ] <== Internal Network "host2-vpp2" ==> [ host2 VM ]
- #
- config.vm.define :host2 do |host2|
- host2.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- host2.vm.provider "virtualbox" do |vb|
- vb.customize ["modifyvm", :id, "--nic2", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet2", "host2-vpp2"]
- vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
- end
- host2.vm.provision "shell" do |s|
- s.path = "bootstrap-host.ubuntu1404.sh"
- s.args = ["host2", "172.16.15.15/24"]
- end
- end
-
- # Define jaws VM (for wireshark) connected to the vpp1 <-> vpp2
- # internal network.
- #
- # [ vpp1 VM ] <==+ Internal Network "vpp1-vpp2" ===> [ vpp2 VM ]
- # [ jaws VM ] <==+
- #
- config.vm.define :jaws do |jaws|
- jaws.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- jaws.vm.provider "virtualbox" do |vb|
- vb.customize ["modifyvm", :id, "--nic2", "intnet"]
- vb.customize ["modifyvm", :id, "--intnet2", "vpp1-vpp2"]
- vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
- end
- jaws.vm.provision "shell" do |s|
- s.path = "bootstrap-host.ubuntu1404.sh"
- s.args = ["jaws", "172.16.15.15/24"]
- end
- end
-end
diff --git a/vagrant-demo/bootstrap-host.ubuntu1404.sh b/vagrant-demo/bootstrap-host.ubuntu1404.sh
deleted file mode 100644
index b84acbf1e..000000000
--- a/vagrant-demo/bootstrap-host.ubuntu1404.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Args
-VAGRANT_VM_NAME="$1"
-echo "Running bootstrap-host.ubuntu1404.sh..."
-echo "VAGRANT_VM_NAME = '$VAGRANT_VM_NAME'"
-
-# Directory and file definitions
-VAGRANT_HOME="/home/vagrant"
-VAGRANT_BASHRC="$VAGRANT_HOME/.bashrc"
-VAGRANT_BASH_ALIASES="$VAGRANT_HOME/.bash_aliases"
-
-# Set prompt to include VM name if provided.
-sudo -H -u vagrant perl -i -pe 's/@\\h/@\\\h\$VM_NAME/g' $VAGRANT_BASHRC
-sudo -H -u vagrant touch $VAGRANT_BASH_ALIASES
-if [ "$VAGRANT_VM_NAME" != "" ] && [ "$(grep -q VM_NAME $VAGRANT_BASH_ALIASES)" = "" ] ; then
- echo -e "\n# Include VM Name in prompt" >> $VAGRANT_BASH_ALIASES
- echo "export VM_NAME=\"($VAGRANT_VM_NAME)\"" >> $VAGRANT_BASH_ALIASES
-fi
-chown vagrant:vagrant $VAGRANT_BASH_ALIASES
-
-# Fix grub-pc on Virtualbox with Ubuntu
-export DEBIAN_FRONTEND=noninteractive
-
-# Add fd.io apt repo in case its needed
-echo "deb http://nexus.fd.io/content/repositories/fd.io.dev/ ./" > /etc/apt/sources.list.d/99fd.io.list
-
-# Standard update + upgrade dance
-apt-get update
-apt-get upgrade -y
-apt-get install -y wireshark
diff --git a/vagrant-demo/ncmount.sh b/vagrant-demo/ncmount.sh
deleted file mode 100755
index 684c38a31..000000000
--- a/vagrant-demo/ncmount.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-
-add_vpp() {
- odl_ip=$1
- vpp_host=$2
- vpp_ip=$3
- vpp_port=$4
-
- vpp_username=admin
- vpp_password=admin
-
- put_data='<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
- <node-id>'$vpp_host'</node-id>
- <host xmlns="urn:opendaylight:netconf-node-topology">'$vpp_ip'</host>
- <port xmlns="urn:opendaylight:netconf-node-topology">'$vpp_port'</port>
- <username xmlns="urn:opendaylight:netconf-node-topology">admin</username>
- <password xmlns="urn:opendaylight:netconf-node-topology">admin</password>
- <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
- <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
- </node>
- '
-curl -u admin:admin -X PUT -d "$put_data" -H 'Content-Type: application/xml' http://$odl_ip:8181/restconf/config/network-topology:network-topology/topology/topology-netconf/node/$vpp_host
-}
-
-if [ -z "$1" ] ||
- [ -z "$2" ] ||
- [ -z "$3" ] ||
- [ -z "$4" ]; then
- echo "usage: ./ncmount.sh <controllerIP_for_mount> <vpp_instance_name> <vpp_IP> <NETCONF_port>
- ie ./ncmount.sh 127.0.0.1 vpp1 192.168.10.12 2830"
- exit 1
-fi
-
-add_vpp $1 $2 $3 $4
diff --git a/vagrant-demo/scripts/host1-cfg.sh b/vagrant-demo/scripts/host1-cfg.sh
deleted file mode 100755
index 14ee1022f..000000000
--- a/vagrant-demo/scripts/host1-cfg.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/bash
-#
-# Script to configure host1.
-#
-# Copyright (c) 2016 Cisco Systems, Inc. and/or others. All rights reserved.
-
-if [ "$(id -un)" != "vagrant" ] || [ "$VM_NAME" != "(host1)" ]; then
- echo "ERROR: Must be run inside the vpp1 vagrant VM!"
- exit 1
-fi
-
-HOST1_IP_ADDR="172.16.10.11"
-HOST2_IP_ADDR="172.16.10.12"
-echo
-echo "Configuring eth1 with $HOST1_IP_ADDR"
-sudo ifconfig eth1 $HOST1_IP_ADDR/24 up
-echo
-echo "ifconfig eth1:"
-ifconfig eth1
-echo
-echo "Run the following command to ping host2:"
-echo " ping $HOST2_IP_ADDR"
-echo
diff --git a/vagrant-demo/scripts/host2-cfg.sh b/vagrant-demo/scripts/host2-cfg.sh
deleted file mode 100755
index 92a663ffc..000000000
--- a/vagrant-demo/scripts/host2-cfg.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/bash
-#
-# Script to configure host2.
-#
-# Copyright (c) 2016 Cisco Systems, Inc. and/or others. All rights reserved.
-
-if [ "$(id -un)" != "vagrant" ] || [ "$VM_NAME" != "(host2)" ]; then
- echo "ERROR: Must be run inside the vpp1 vagrant VM!"
- exit 1
-fi
-
-HOST1_IP_ADDR="172.16.10.11"
-HOST2_IP_ADDR="172.16.10.12"
-echo
-echo "Configuring eth1 with $HOST2_IP_ADDR"
-sudo ifconfig eth1 $HOST2_IP_ADDR/24 up
-echo
-echo "ifconfig eth1:"
-ifconfig eth1
-echo
-echo "Run the following command to ping host1:"
-echo " ping $HOST1_IP_ADDR"
-echo
diff --git a/vagrant-demo/scripts/vbd-reset.sh b/vagrant-demo/scripts/vbd-reset.sh
deleted file mode 100755
index a56b96f8a..000000000
--- a/vagrant-demo/scripts/vbd-reset.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/bash
-#
-# Script to reset the ODL Virtual Bridge Domain application
-#
-# Copyright (c) 2016 Cisco Systems, Inc. and/or others. All rights reserved.
-
-if [ "$(id -un)" != "vagrant" ] || [ "$VM_NAME" != "(vbd)" ]; then
- echo "ERROR: Must be run inside the vbd vagrant VM!"
- exit 1
-fi
-
-APP_NAME="ODL VBD application"
-KARAF_HOME="$(dirname /opt/honeycomb/vbd-karaf*/bin)"
-BIN_DIR="$KARAF_HOME/bin"
-KARAF_LOG="$KARAF_HOME/data/log/karaf.log"
-CURRENT_DIR="$KARAF_HOME/etc/opendaylight/current"
-DATA_DIR="$KARAF_HOME/data"
-PERSISTENT_STATE="$CURRENT_DIR $DATA_DIR"
-
-echo
-echo "Stopping $APP_NAME"
-sudo $BIN_DIR/stop
-echo -n "Waiting"
-cnt=0
-while [ "$(ps -eaf | grep -v grep | grep karaf)" != "" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
- if [ "$cnt" -eq "10" ] ; then
- echo
- echo -n "$APP_NAME won't stop! Killing it.."
- sudo kill $(ps -eaf | grep -v grep | grep karaf | awk '{ print $2 }')
- fi
-done
-echo "Done"
-echo
-echo "Deleting $APP_NAME persistent state."
-sudo rm -rf $CURRENT_DIR
-sudo rm -rf $DATA_DIR
-echo
-echo "Starting $APP_NAME"
-sudo $BIN_DIR/start
-sleep 2
-echo -n "Waiting"
-while [ "$(grep xsql $KARAF_LOG | grep Successfully)" = "" ] ; do
- echo -n "."
- sleep 2
-done
-cnt=0
-while [ "$cnt" -lt "5" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
-done
-echo
-echo "Reset $APP_NAME is complete!"
-
diff --git a/vagrant-demo/scripts/vpp1-reset.sh b/vagrant-demo/scripts/vpp1-reset.sh
deleted file mode 100755
index a407ad137..000000000
--- a/vagrant-demo/scripts/vpp1-reset.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/bash
-#
-# Script to reset the vpp1 Honeycomb agent.
-#
-# Copyright (c) 2016 Cisco Systems, Inc. and/or others. All rights reserved.
-
-if [ "$(id -un)" != "vagrant" ] || [ "$VM_NAME" != "(vpp1)" ]; then
- echo "ERROR: Must be run inside the vpp1 vagrant VM!"
- exit 1
-fi
-
-APP_NAME="VPP1 Honeycomb Agent"
-KARAF_HOME="$(dirname /opt/honeycomb/v3po-karaf*/bin)"
-BIN_DIR="$KARAF_HOME/bin"
-KARAF_LOG="$KARAF_HOME/data/log/karaf.log"
-CURRENT_DIR="$KARAF_HOME/etc/opendaylight/current"
-DATA_DIR="$KARAF_HOME/data"
-VPP2VPP_SRC_IP_ADDR="10.10.10.11"
-VPP2VPP_DST_IP_ADDR="10.10.10.12"
-VNI=1
-VRF_ID=7
-BRIDGE_ID=1
-SHG=1
-
-echo
-echo "Stopping VPP..."
-sudo stop vpp
-echo "Done"
-echo
-echo "Stopping $APP_NAME"
-sudo $BIN_DIR/stop
-echo -n "Waiting"
-cnt=0
-while [ "$(ps -eaf | grep -v grep | grep karaf)" != "" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
- if [ $cnt -eq 10 ] ; then
- echo
- echo -n "$APP_NAME won't stop! Killing it.."
- sudo kill $(ps -eaf | grep -v grep | grep karaf | awk '{ print $2 }')
- fi
-done
-echo "Done"
-echo
-echo "Deleting $APP_NAME persistent state."
-sudo rm -rf $DATA_DIR
-sudo rm -rf $CURRENT_DIR
-echo
-echo "Starting $APP_NAME"
-sudo $BIN_DIR/start
-echo "Starting VPP"
-sudo start vpp
-echo "Configuring vpp"
-sudo vppctl set int state GigabitEthernet0/9/0 up
-sudo vppctl set int state GigabitEthernet0/a/0 up
-sudo vppctl set int ip table GigabitEthernet0/a/0 7
-sudo vppctl set int ip address GigabitEthernet0/a/0 $VPP2VPP_SRC_IP_ADDR/24
-if [ "$1" = "vxlan" ] ; then
- sudo vppctl set int l2 bridge GigabitEthernet0/9/0 $BRIDGE_ID
- sudo vppctl create vxlan tunnel src $VPP2VPP_SRC_IP_ADDR dst $VPP2VPP_DST_IP_ADDR vni $VNI encap-vrf-id $VRF_ID decap-next l2
- sudo vppctl set int l2 bridge vxlan_tunnel0 $BRIDGE_ID $SHG
-fi
-
-echo
-echo "Waiting for $APP_NAME to initialize..."
-while [ "$(grep VPPOPER $KARAF_LOG)" = "" ] ; do
- echo -n "."
- sleep 2
-done
-cnt=0
-while [ "$cnt" -lt "5" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
-done
-echo
-echo VPP configuration:
-echo
-echo "show hardware:"
-sudo vppctl show hard
-echo
-echo "show inteface:"
-sudo vppctl show int
-echo
-echo "show ip fib:"
-sudo vppctl show ip fib
-if [ "$1" = "vxlan" ] ; then
- echo
- echo "show bridge $BRIDGE_ID detail:"
- sudo vppctl show bridge $BRIDGE_ID detail
-fi
-echo
-echo "Reset $APP_NAME is complete!"
-
diff --git a/vagrant-demo/scripts/vpp2-reset.sh b/vagrant-demo/scripts/vpp2-reset.sh
deleted file mode 100755
index 49be70dbc..000000000
--- a/vagrant-demo/scripts/vpp2-reset.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /bin/bash
-#
-# Script to reset the vpp1 Honeycomb agent.
-#
-# Copyright (c) 2016 Cisco Systems, Inc. and/or others. All rights reserved.
-
-if [ "$(id -un)" != "vagrant" ] || [ "$VM_NAME" != "(vpp2)" ]; then
- echo "ERROR: Must be run inside the vpp2 vagrant VM!"
- exit 1
-fi
-
-APP_NAME="VPP2 Honeycomb Agent"
-KARAF_HOME="$(dirname /opt/honeycomb/v3po-karaf*/bin)"
-BIN_DIR="$KARAF_HOME/bin"
-KARAF_LOG="$KARAF_HOME/data/log/karaf.log"
-CURRENT_DIR="$KARAF_HOME/etc/opendaylight/current"
-DATA_DIR="$KARAF_HOME/data"
-PERSISTENT_STATE="$CURRENT_DIR $DATA_DIR"
-VPP2VPP_SRC_IP_ADDR="10.10.10.12"
-VPP2VPP_DST_IP_ADDR="10.10.10.11"
-VNI=1
-VRF_ID=7
-BRIDGE_ID=1
-SHG=1
-
-echo
-echo "Stopping VPP..."
-sudo stop vpp
-echo "Done"
-echo
-echo "Stopping $APP_NAME"
-sudo $BIN_DIR/stop
-echo -n "Waiting"
-cnt=0
-while [ "$(ps -eaf | grep -v grep | grep karaf)" != "" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
- if [ $cnt -eq 10 ] ; then
- echo
- echo -n "$APP_NAME won't stop! Killing it.."
- sudo kill $(ps -eaf | grep -v grep | grep karaf | awk '{ print $2 }')
- fi
-done
-echo "Done"
-echo
-echo "Deleting $APP_NAME persistent state."
-sudo rm -rf $DATA_DIR
-sudo rm -rf $CURRENT_DIR
-echo
-echo "Starting $APP_NAME"
-sudo $BIN_DIR/start
-echo "Starting VPP"
-sudo start vpp
-echo "Configuring vpp"
-sudo vppctl set int state GigabitEthernet0/9/0 up
-sudo vppctl set int state GigabitEthernet0/a/0 up
-sudo vppctl set int ip table GigabitEthernet0/a/0 7
-sudo vppctl set int ip address GigabitEthernet0/a/0 $VPP2VPP_SRC_IP_ADDR/24
-if [ "$1" = "vxlan" ] ; then
- sudo vppctl set int l2 bridge GigabitEthernet0/9/0 $BRIDGE_ID
- sudo vppctl create vxlan tunnel src $VPP2VPP_SRC_IP_ADDR dst $VPP2VPP_DST_IP_ADDR vni $VNI encap-vrf-id $VRF_ID decap-next l2
- sudo vppctl set int l2 bridge vxlan_tunnel0 $BRIDGE_ID $SHG
-fi
-if [ "$1" = "vxlan" ] ; then
- echo
- echo "show bridge $BRIDGE_ID detail:"
- sudo vppctl show bridge $BRIDGE_ID detail
-fi
-echo
-echo "Waiting for $APP_NAME to initialize"
-while [ "$(grep VPPOPER $KARAF_LOG)" = "" ] ; do
- echo -n "."
- sleep 2
-done
-cnt=0
-while [ "$cnt" -lt "5" ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
-done
-while [ $cnt -lt 5 ] ; do
- echo -n "."
- sleep 2
- let "cnt = cnt + 1"
-done
-echo
-echo VPP configuration:
-echo
-echo "show hardware:"
-sudo vppctl show hard
-echo
-echo "show inteface:"
-sudo vppctl show int
-echo
-echo "show ip fib:"
-sudo vppctl show ip fib
-if [ "$1" = "vxlan" ] ; then
- echo
- echo "show bridge $BRIDGE_ID detail:"
- sudo vppctl show bridge $BRIDGE_ID detail
-fi
-echo
-echo "Reset $APP_NAME is complete!"
-
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
deleted file mode 100644
index 7b72c87ce..000000000
--- a/vagrant/Vagrantfile
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-
- config.ssh.forward_x11 = true
-
- if ENV.key?('VAGRANT_VM_NAME')
- vagrant_vm_name = ENV['VAGRANT_VM_NAME']
- else
- vagrant_vm_name = ""
- end
-
- if ENV.key?('KARAF_PACKAGES')
- config.vm.synced_folder ENV['KARAF_PACKAGES'], "/karaf-packages", disabled: false
- end
-
- # If specified, add a private network interface for the ODL VBD app
- # to communicate with VPP Honeycomb agents. VPP is not installed
- # in an ODL VDB application VM.
- if ENV.key?('VAGRANT_VBD_VM')
- vagrant_vbd_vm = "is_vbd_vm"
- if ENV.key?('VAGRANT_VBD_ADDR')
- config.vm.network "private_network", ip: ENV['VAGRANT_VBD_ADDR']
- end
- vagrant_vpp_agent_addr = ""
-
- else
- vagrant_vbd_vm = "is_vpp_agent_vm"
-
- if ENV.key?('VAGRANT_VPP_AGENT_ADDR')
- vagrant_vpp_agent_addr = ENV['VAGRANT_VPP_AGENT_ADDR']
- config.vm.network "private_network", ip: "#{vagrant_vpp_agent_addr}"
- else
- vagrant_vpp_agent_addr = ""
- end
-
- # Define some physical ports for your VMs to be used by DPDK
- nics = 0
- 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
- # Mount VPP repository if specified
- if ENV.key?('VPP_REPO')
- config.vm.synced_folder ENV['VPP_REPO'], "/vpp", disabled: false
- end
- end
-
- # Pick the right distro and bootstrap, default is ubuntu1404
- distro = ENV['HONEYCOMB_VAGRANT_DISTRO']
- if distro == 'centos7'
- config.vm.box = "puppetlabs/centos-7.0-64-nocm"
- config.vm.provision 'shell' do |s|
- s.path = "bootstrap.centos7.sh"
- s.args = ["#{vagrant_vm_name}", "#{vagrant_vbd_vm}", "#{vagrant_vpp_agent_addr}"]
- end
- else
- config.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
- config.vm.provision 'shell' do |s|
- s.path = "bootstrap.ubuntu1404.sh"
- s.args = ["#{vagrant_vm_name}", "#{vagrant_vbd_vm}", "#{vagrant_vpp_agent_addr}"]
- end
- end
-
- # 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
-
- # use http proxy if available
- if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")
- config.proxy.http = "$http_proxy"
- config.proxy.https = "$https_proxy"
- config.proxy.no_proxy = "localhost,127.0.0.1"
- end
-
- # Mount Maven repository if specified
- if ENV.key?('HONEYCOMB_M2_REPO')
- config.vm.synced_folder ENV['HONEYCOMB_M2_REPO'], "/m2-repository", disabled: false
- end
-
- # Mount Honeycomb repository
- config.vm.synced_folder "../", "/honeycomb", disabled: false
-
- # Memory/cpu config
- config.vm.provider "virtualbox" do |vb|
- vb.memory = "4096"
- end
- config.vm.provider "vmware_fusion" do |fusion,override|
- fusion.vmx["memsize"] = "4096"
- end
- config.vm.provider "vmware_workstation" do |vws,override|
- vws.vmx["memsize"] = "8192"
- vws.vmx["numvcpus"] = "4"
- end
-end
diff --git a/vagrant/bootstrap.centos7.sh b/vagrant/bootstrap.centos7.sh
deleted file mode 100644
index f55e68a24..000000000
--- a/vagrant/bootstrap.centos7.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# Standard update + upgrade dance
-yum check-update
-yum update -y
-
-# Install build tools
-yum groupinstall 'Development Tools' -y
-yum install openssl-devel -y
-yum install glibc-static -y
-
-# Install jdk and maven
-yum install -y java-1.8.0-openjdk-devel
-
-# Load the uio kernel module
-modprobe uio_pci_generic
-
-echo uio_pci_generic >> /etc/modules-load.d/uio_pci_generic.conf
-
-# Setup for hugepages using upstart so it persists across reboots
-sysctl -w vm.nr_hugepages=1024
-echo "vm.nr_hugepages=1024" >> /etc/sysctl.conf
-mkdir -p /mnt/huge
-echo "hugetlbfs /mnt/huge hugetlbfs defaults 0 0" >> /etc/fstab
-mount /mnt/huge
-
-# Setup the vpp code
-cd ~vagrant/
-sudo -u vagrant mkdir git
-cd git/
-
-# Check if git exists and remove it before attempting clone, else clone ineffective when "reload --provision"
-[ -d vpp ] && rm -rf vpp
-sudo -H -u vagrant git clone /vpp
-cd vpp
-
-# Initial vpp build
-if [ -d build-root ]; then
- # Bootstrap vpp
- cd build-root/
- sudo -H -u vagrant ./bootstrap.sh
-
- # Build vpp
- sudo -H -u vagrant make PLATFORM=vpp TAG=vpp_debug install-packages
- cd ~vagrant/
- cat /vagrant/README
-fi
diff --git a/vagrant/bootstrap.ubuntu1404.sh b/vagrant/bootstrap.ubuntu1404.sh
deleted file mode 100644
index 28dda9884..000000000
--- a/vagrant/bootstrap.ubuntu1404.sh
+++ /dev/null
@@ -1,312 +0,0 @@
-# Args
-VAGRANT_VM_NAME="$1"
-VAGRANT_VBD_VM="$2"
-VAGRANT_VPP_AGENT_ADDR="$3"
-echo "---"
-echo " Running bootstrap.ubuntu1404.sh..."
-echo "---"
-echo "---"
-echo " VAGRANT_VM_NAME = '$VAGRANT_VM_NAME'"
-echo " VAGRANT_VBD_VM = '$VAGRANT_VBD_VM'"
-echo " VAGRANT_VPP_AGENT_ADDR = '$VAGRANT_VPP_AGENT_ADDR'"
-echo "---"
-
-# Directory and file definitions
-HONEYCOMB_MOUNT="/honeycomb"
-KARAF_PACKAGES_MOUNT="/karaf-packages"
-M2_SETTINGS_XML="$HONEYCOMB_MOUNT/vagrant/settings.xml"
-M2_MOUNT="/m2-repository"
-VPP_MOUNT="/vpp"
-VPP_BUILD_ROOT="$VPP_MOUNT/build-root"
-VAGRANT_HOME="/home/vagrant"
-VAGRANT_BASHRC="$VAGRANT_HOME/.bashrc"
-VAGRANT_BASH_ALIASES="$VAGRANT_HOME/.bash_aliases"
-VAGRANT_M2_DIR="$VAGRANT_HOME/.m2"
-VAGRANT_M2_REPOSITORY="$VAGRANT_M2_DIR/repository"
-HONEYCOMB_INSTALL_DIR="/opt/honeycomb"
-FDIO_SNAPSHOT_URL="https://nexus.fd.io/content/repositories/fd.io.snapshot"
-FDIO_DEV_URL="http://nexus.fd.io/content/repositories/fd.io.dev/"
-APACHE_MAVEN_VER="apache-maven-3.3.9"
-APACHE_MAVEN_TAR_GZ="$APACHE_MAVEN_VER-bin.tar.gz"
-APACHE_MAVEN_URL="http://apache.go-parts.com/maven/maven-3/3.3.9/binaries/$APACHE_MAVEN_TAR_GZ"
-APACHE_MAVEN_INSTALL_DIR="/usr/local/apache-maven"
-GOOGLE_CHROME_DEB_PKG="google-chrome-stable_current_amd64.deb"
-GOOGLE_CHROME_URL="https://dl.google.com/linux/direct/$GOOGLE_CHROME_DEB_PKG"
-
-# Don't install VPP if this is an ODL VBD application VM
-if [ "$VAGRANT_VBD_VM" != "is_vbd_vm" ] ; then
- echo "---"
- echo " Configuring hugepages for VPP"
- echo "---"
- # Setup for hugepages using upstart so it persists across reboots
- echo "vm.nr_hugepages=1024" >> /etc/sysctl.d/20-hugepages.conf
- sysctl --system
- cat << EOF > /etc/init/hugepages.conf
-start on runlevel [2345]
-
-task
-
-script
- mkdir -p /run/hugepages/kvm || true
- rm -f /run/hugepages/kvm/* || true
- rm -f /dev/shm/* || true
- mount -t hugetlbfs nodev /run/hugepages/kvm
-end script
-EOF
- # Allocate hugepages.conf right now. Verify that
- # all hugepages have been allocated. If the VM
- # runs out of resources, the messages below will
- # identify the issue. Front and Center!
- nr_hugepages=$(cat /proc/sys/vm/nr_hugepages)
- while [ "$nr_hugepages" != "1024" ] ; do
- echo "---"
- echo -n " Allocating hugepages... "
- start hugepages
- nr_hugepages=$(cat /proc/sys/vm/nr_hugepages)
- echo " nr_hugepages = $nr_hugepages"
- echo "---"
- done
-fi
-
-# Set prompt to include VM name if provided.
-sudo -H -u vagrant perl -i -pe 's/@\\h/@\\\h\$VM_NAME/g' $VAGRANT_BASHRC
-sudo -H -u vagrant touch $VAGRANT_BASH_ALIASES
-if [ "$VAGRANT_VM_NAME" != "" ] && [ "$(grep VM_NAME $VAGRANT_BASH_ALIASES)" = "" ] ; then
- echo -e "\n# Include VM Name in prompt\nexport VM_NAME=\"($VAGRANT_VM_NAME)\"" >> $VAGRANT_BASH_ALIASES
-fi
-
-# Fix grub-pc on Virtualbox with Ubuntu
-export DEBIAN_FRONTEND=noninteractive
-
-# Add fd.io apt repo in case its needed
-echo "deb $FDIO_DEV_URL ./" > /etc/apt/sources.list.d/99fd.io.list
-
-# Standard update + upgrade dance
-echo "---"
-echo " Update and install ubuntu packages for development environment"
-echo "---"
-apt-get update
-apt-get upgrade -y
-
-# Install build tools
-apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev git-review
-
-# Install uio
-apt-get install -y linux-image-extra-`uname -r`
-
-# Install jdk and maven
-echo "---"
-echo " Installing openjdk"
-echo "---"
-apt-get install -y openjdk-8-jdk
-mkdir -p $APACHE_MAVEN_INSTALL_DIR
-if [ -d "$KARAF_PACKAGES_MOUNT" ] ; then
- APACHE_MAVEN_TARBALL="$KARAF_PACKAGES_MOUNT/$APACHE_MAVEN_TAR_GZ"
- if [ ! -f "$APACHE_MAVEN_TARBALL" ] ; then
- echo "---"
- echo " Downloading $APACHE_MAVEN_TAR_GZ and caching it in $KARAF_PACKAGES_MOUNT"
- echo "---"
- cd $KARAF_PACKAGES_MOUNT
- wget -q $APACHE_MAVEN_URL
- cd
- fi
-else
- echo "---"
- echo " Downloading $APACHE_MAVEN_TAR_GZ in $APACHE_MAVEN_INSTALL_DIR"
- echo "---"
- cd $APACHE_MAVEN_INSTALL_DIR
- wget -q $APACHE_MAVEN_URL
- APACHE_MAVEN_TARBALL="$APACHE_MAVEN_INSTALL_DIR/$APACHE_MAVEN_TAR_GZ"
- cd
-fi
-echo "---"
-echo " Installing $APACHE_MAVEN_TARBALL in $APACHE_MAVEN_INSTALL_DIR"
-echo "---"
-tar -xzf $APACHE_MAVEN_TARBALL -C $APACHE_MAVEN_INSTALL_DIR
-update-alternatives --install /usr/bin/mvn mvn $APACHE_MAVEN_INSTALL_DIR/$APACHE_MAVEN_VER/bin/mvn 1
-update-alternatives --config mvn
-
-# Set up Maven
-sudo -H -u vagrant mkdir -p $VAGRANT_M2_DIR
-sudo -H -u vagrant cp $M2_SETTINGS_XML $VAGRANT_M2_DIR
-if [ "$(grep M2_HOME $VAGRANT_BASH_ALIASES)" = "" ] ; then
- cat << EOF >> $VAGRANT_BASH_ALIASES
-
-# Maven Environment variables
-export M2_HOME=/usr/local/apache-maven/apache-maven-3.3.9
-export MAVEN_OPTS="-Xms256m -Xmx512m" # Very important to put the "m" on the end
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-EOF
- chown vagrant:vagrant $VAGRANT_BASH_ALIASES
-fi
-source $VAGRANT_BASH_ALIASES
-# Use the external Maven M2 repository as a seed if available.
-if [ -d "/m2-repository" ] ; then
- sudo -H -u vagrant sed -i -e 's,/home/vagrant/.m2/repository,/m2-repository,g' /home/vagrant/.m2/settings.xml
- VAGRANT_M2_REPOSITORY="/m2-repository"
-fi
-
-# Don't install VPP and ODL Honeycomb Agent if this is an ODL VBD application VM
-if [ "$VAGRANT_VBD_VM" != "is_vbd_vm" ] ; then
- # Look for karaf packages
- if [ -d "$KARAF_PACKAGES_MOUNT" ] ; then
- V3PO_TARBALL="$(find $KARAF_PACKAGES_MOUNT -name v3po-karaf*.tar.gz | sort | tail -1)"
- if [ ! -f "$V3PO_TARBALL" ] ; then
- echo "---"
- echo " Fetching latest V3PO tarball from $FDIO_SNAPSHOT_URL"
- echo "---"
- sudo -H -u vagrant mvn dependency:get -DremoteRepositories=$FDIO_SNAPSHOT_URL -DgroupId=io.fd.honeycomb.v3po -DartifactId=v3po-karaf -Dversion=1.0.0-SNAPSHOT -Dpackaging=tar.gz -Dtransitive=false
- M2_TB_DIR="$VAGRANT_M2_REPOSITORY/io/fd/honeycomb/v3po/v3po-karaf/1.0.0-SNAPSHOT"
- V3PO_TARBALL="$(find $M2_TB_DIR -name v3po-karaf*.tar.gz | grep -v v3po-karaf-1.0.0-SNAPSHOT | sort | tail -1)"
- echo "---"
- echo " Copying V3PO tarball ($(basename $V3PO_TARBALL)) to $KARAF_PACKAGES_MOUNT"
- echo "---"
- [ -f "$V3PO_TARBALL" ] && cp -p $V3PO_TARBALL $KARAF_PACKAGES_MOUNT
- V3PO_TARBALL="$(find $KARAF_PACKAGES_MOUNT -name v3po-karaf*.tar.gz | sort | tail -1)"
- fi
- else
- V3PO_TARBALL="$HONEYCOMB_MOUNT/v3po/karaf/target/v3po-karaf*.tar.gz"
- fi
-
- # Disable all ethernet interfaces other than the default route
- # interface so VPP will use those interfaces. The VPP auto-blacklist
- # algorithm prevents the use of any physical interface contained in the
- # routing table (i.e. "route --inet --inet6") preventing the theft of
- # the management ethernet interface by VPP from the kernel.
- for intf in $(ls /sys/class/net) ; do
- if [ "$VAGRANT_VPP_AGENT_ADDR" != "" ] && [ "$(ifconfig $intf | grep $VAGRANT_VPP_AGENT_ADDR)" != "" ] ; then
- continue;
- fi
- if [ -d "/sys/class/net/$intf/device" ] && [ "$(route --inet --inet6 | grep default | grep $intf)" == "" ] ; then
- ifconfig $intf down
- fi
- done
-
- # Install VPP
- if [ -d "$VPP_MOUNT" ] ; then
- # Fix the silly notion that /bin/sh should point to dash by pointing it to bash
- sudo update-alternatives --install /bin/sh sh /bin/bash 100
-
- # Build and install VPP if necessary
- if [ -d "$VPP_BUILD_ROOT" ] ; then
- if [ "$(ls $VPP_BUILD_ROOT/*.deb)" = "" ] ; then
- echo "---"
- echo " Building VPP"
- echo "---"
- # Bootstrap vpp
- cd $VPP_BUILD_ROOT
- sudo -H -u vagrant ./bootstrap.sh
- # Build vpp
- sudo -H -u vagrant make V=0 PLATFORM=vpp TAG=vpp_debug install-deb
- fi
- # Install debian packages
- echo "---"
- echo " Installing VPP from $VPP_BUILD_ROOT"
- echo "---"
- dpkg -i $VPP_BUILD_ROOT/*.deb
- fi
- else
- echo "---"
- echo " Installing VPP from nexus.fd.io"
- echo "---"
- apt-get install vpp vpp-dpdk-dev vpp-dpdk-dkms vpp-dev vpp-dbg -y --force-yes
- fi
- # Start VPP if it is installed.
- if [ "$(dpkg -l | grep vpp)" != "" ] ; then
- echo "---"
- echo " Starting VPP"
- echo "---"
- start vpp
- fi
-
- # Build Honeycomb if necessary
- if [ ! -f "$V3PO_TARBALL" ] ; then
- echo "---"
- echo " Building Honeycomb..."
- echo "---"
- cd $HONEYCOMB_MOUNT
- sudo -H -u vagrant mvn clean install -DskipTests
- V3PO_TARBALL="$(find $HONEYCOMB_MOUNT/v3po/karaf/target/ -name v3po-karaf*.tar.gz | sort | tail -1)"
- fi
-
- # Install honeycomb agent (v3po) if available.
- if [ -f "$V3PO_TARBALL" ] ; then
- V3PO_TARBALL_DIR="$(tar tvf $V3PO_TARBALL | head -1 | awk '{ print $6 }' | cut -d / -f 1)"
- V3PO_KARAF_DIR="$HONEYCOMB_INSTALL_DIR/$V3PO_TARBALL_DIR"
- echo "---"
- echo " Installing Honeycomb VPP agent in $V3PO_KARAF_DIR from $V3PO_TARBALL"
- echo "---"
- [ ! -d "$HONEYCOMB_INSTALL_DIR" ] && mkdir -p $HONEYCOMB_INSTALL_DIR
- [ -d "$V3PO_KARAF_DIR" ] && rm -rf $V3PO_KARAF_DIR
- tar xzf $V3PO_TARBALL -C $HONEYCOMB_INSTALL_DIR
- $V3PO_KARAF_DIR/bin/start
- echo -e "\n\n# Add V3PO karaf bin directory to PATH\nexport PATH=\$PATH:$V3PO_KARAF_DIR/bin" >> $VAGRANT_BASH_ALIASES
- else
- echo "---"
- echo " WARNING: V3PO Tarball is not available: $V3PO_TARBALL"
- echo "---"
- fi
-
-# ODL VBD application VM specific installation components
-else
- if [ -d "$KARAF_PACKAGES_MOUNT" ] ; then
- VBD_TARBALL="$(find $KARAF_PACKAGES_MOUNT -name vbd-karaf*.tar.gz | sort | tail -1)"
- if [ ! -f "$VBD_TARBALL" ] ; then
- echo "---"
- echo " Fetching latest VBD tarball from $FDIO_SNAPSHOT_URL"
- echo "---"
- sudo -H -u vagrant mvn dependency:get -DremoteRepositories=$FDIO_SNAPSHOT_URL -DgroupId=io.fd.honeycomb.vbd -DartifactId=vbd-karaf -Dversion=1.0.0-SNAPSHOT -Dpackaging=tar.gz -Dtransitive=false
- M2_TB_DIR="$VAGRANT_M2_REPOSITORY/io/fd/honeycomb/vbd/vbd-karaf/1.0.0-SNAPSHOT"
- VBD_TARBALL="$(find $M2_TB_DIR -name vbd-karaf*.tar.gz | grep -v vbd-karaf-1.0.0-SNAPSHOT | sort | tail -1)"
- echo "---"
- echo " Copying VBD tarball ($(basename $VBD_TARBALL)) to $KARAF_PACKAGES_MOUNT"
- echo "---"
- [ -f "$VBD_TARBALL" ] && cp -p $VBD_TARBALL $KARAF_PACKAGES_MOUNT
- VBD_TARBALL="$(find $KARAF_PACKAGES_MOUNT -name vbd-karaf*.tar.gz | sort | tail -1)"
- fi
- else
- VBD_TARBALL="$(find $HONEYCOMB_MOUNT/vbd/karaf/target/ -name vbd-karaf*.tar.gz | sort | tail -1)"
- fi
-
- # Build Honeycomb if necessary
- if [ ! -f "$VBD_TARBALL" ] ; then
- echo "---"
- echo " Building Honeycomb..."
- echo "---"
- cd $HONEYCOMB_MOUNT
- sudo -H -u vagrant mvn clean install -DskipTests
- VBD_TARBALL="$HONEYCOMB_MOUNT/vbd/karaf/target/vbd-karaf*.tar.gz"
- fi
- # Install ODL Virtual Bridge Domain App if available.
- if [ -f "$VBD_TARBALL" ] ; then
- VBD_TARBALL_DIR="$(tar tvf $VBD_TARBALL | head -1 | awk '{ print $6 }' | cut -d / -f 1)"
- VBD_KARAF_DIR="$HONEYCOMB_INSTALL_DIR/$VBD_TARBALL_DIR"
- echo "---"
- echo " Installing ODL Virtual Bridge Domain application in $HONEYCOMB_INSTALL_DIR/$VBD_SNAPSHOT"
- echo "---"
- [ ! -d "$HONEYCOMB_INSTALL_DIR" ] && mkdir -p $HONEYCOMB_INSTALL_DIR
- [ -d "$VBD_KARAF_DIR" ] && rm -rf $VBD_KARAF_DIR
- tar xzf $VBD_TARBALL -C $HONEYCOMB_INSTALL_DIR
- $VBD_KARAF_DIR/bin/start
- echo -e "\n\n# Add VBD karaf bin directory to PATH\nexport PATH=\$PATH:$VBD_KARAF_DIR/bin" >> $VAGRANT_BASH_ALIASES
- else
- echo "---"
- echo " WARNING: VBD tarball is not available: $VBD_TARBALL"
- echo "---"
- fi
-
- # Install google chrome browser for ODL YANGUI
- echo "---"
- echo " Installing google-chrome"
- echo "---"
- cd /opt
- wget -q $GOOGLE_CHROME_URL
- sudo dpkg -i $GOOGLE_CHROME_DEB_PKG
- sudo apt-get install -fy
-fi
-
-echo "---"
-echo " ========================="
-echo " VM Installation Complete!"
-echo " ========================="
-echo "---"
diff --git a/vagrant/settings.xml b/vagrant/settings.xml
deleted file mode 100644
index 831256199..000000000
--- a/vagrant/settings.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <!-- Include localRepository so it can be changed by vagrant bootstrap script -->
- <localRepository>/home/vagrant/.m2/repository</localRepository>
-
- <profiles>
- <profile>
- <id>fd.io-release</id>
- <repositories>
- <repository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>fd.io-snapshots</id>
- <repositories>
- <repository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-shapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>fd.io-release</activeProfile>
- <activeProfile>fd.io-snapshots</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-</settings>