vpp demo update

updating some config files for hc and vpp
reducing size of RAM for VMs
reducing hugepages for VPP

Change-Id: I89d34dc7bf4ac1fec08629d029db85097931dd97
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

diff --git a/demos/vpp-demo/Vagrantfile b/demos/vpp-demo/Vagrantfile
index 1f9a57625c5d5e71d650c568d1c013d3aaeda35f..95c2422c17bac66c127b9bece5d9ab05f45db30d 100644 (file)
--- a/demos/vpp-demo/Vagrantfile
+++ b/demos/vpp-demo/Vagrantfile
@@ -43,7 +43,7 @@ def add_compute(config, name, mgmt_ip, port1, port2)
     node.vm.network "private_network", type: "dhcp", auto_config: false, virtualbox__intnet: port1
     node.vm.network "private_network", type: "dhcp", auto_config: false, virtualbox__intnet: port2
     node.vm.provider "virtualbox" do |vb|
-      vb.memory = "4096"
+      vb.memory = "3072"
       vb.cpus = 2
       vb.customize ["modifyvm", :id, "--ioapic", "on"]
       vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"]
@@ -84,8 +84,8 @@ def add_controller(config, name, mgmt_ip, port1, port2)
     node.vm.network "private_network", type: "dhcp", auto_config: false, virtualbox__intnet: port1
     node.vm.network "private_network", type: "dhcp", auto_config: false, virtualbox__intnet: port2
     node.vm.provider "virtualbox" do |vb|
-      vb.memory = "4096"
-      vb.cpus = 4
+      vb.memory = "3584"
+      vb.cpus = 3
       vb.customize ["modifyvm", :id, "--ioapic", "on"]
       vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"]
       vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"]

diff --git a/demos/vpp-demo/readme.rst b/demos/vpp-demo/readme.rst
index ab86bac454bdc7b74409d740d7e15889c68c4a7d..c8cd0b0cf88d3a5a154cfb7df5493e06e8651463 100644 (file)
--- a/demos/vpp-demo/readme.rst
+++ b/demos/vpp-demo/readme.rst
@@ -9,6 +9,11 @@ Vagrant then creates 3VMs (controller, compute0 and compute1). After vagrant fin
 "vagrant halt" command and bring them up again with "vagrant up" command. If distribution-karaf-0.5.0-Boron.tar.gz is
 available in vpp-demo folder vagrant setup will use this one. If it is not it will download ODL to controller node.
 
+If you want to use ODL Carbon (current master) you need to change also the versions of Honeycomb and VPP. The repositories are added
+to "/etc/apt/sources.list.d/99fd.io.list". For Boron use "https://nexus.fd.io/content/repositories/fd.io.stable.1609.ubuntu.trusty.main/"
+which is default and for Carbon use "https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/".
+You just need to comment out undesired repositories and uncomment repository that you want to use, then update VPP and honeycomb to new versions.
+
 DEMO setup
 ----------
 (repeat this everytime you want to reset the demo)

diff --git a/demos/vpp-demo/vagrant_scripts/install-hc.sh b/demos/vpp-demo/vagrant_scripts/install-hc.sh
index c3e928a0b41d36b209397f015c7aac0910d35402..477d490905f8aaeebbc474b8248d7146f0c57136 100644 (file)
--- a/demos/vpp-demo/vagrant_scripts/install-hc.sh
+++ b/demos/vpp-demo/vagrant_scripts/install-hc.sh
@@ -5,6 +5,9 @@ echo "Installing Honeycomb..."
 sudo apt-get update --allow-unauthenticated
 sudo apt-get -y -f install --allow-unauthenticated
 sudo apt-get -qq install -y --allow-unauthenticated honeycomb
-sed -i 's/"restconf-port": 8181/"restconf-port": 8283/g' /opt/honeycomb/config/honeycomb.json
+sudo sed -i 's/"persist-context": "true"/"persist-context": "false"/g' /opt/honeycomb/config/honeycomb.json
+sudo sed -i 's/"persist-config": "true"/"persist-config": "false"/g' /opt/honeycomb/config/honeycomb.json
+sudo sed -i 's/"127.0.0.1"/"0.0.0.0"/g' /opt/honeycomb/config/honeycomb.json
+sudo sed -i 's/"restconf-port": 8183/"restconf-port": 8283/g' /opt/honeycomb/config/honeycomb.json
 echo "Installing Honeycomb done."
 #sudo service honeycomb start
\ No newline at end of file

diff --git a/demos/vpp-demo/vagrant_scripts/install-prereqs.sh b/demos/vpp-demo/vagrant_scripts/install-prereqs.sh
index f6cc005e2f79ef30534c70fd244c824f70e33150..519716e0b47b03b9c4f8618fcbc55f6b5d69755f 100644 (file)
--- a/demos/vpp-demo/vagrant_scripts/install-prereqs.sh
+++ b/demos/vpp-demo/vagrant_scripts/install-prereqs.sh
@@ -8,6 +8,8 @@ sudo sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/g' /root/.bashrc
 
 if [ ! -f /etc/apt/sources.list.d/99fd.io.list ];then
     echo "deb https://nexus.fd.io/content/repositories/fd.io.stable.1609.ubuntu.trusty.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
+    echo "#deb https://nexus.fd.io/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
+    echo "#deb https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
 fi
 sudo apt-get -qq update --allow-unauthenticated
 sudo apt-get -y remove apparmor apparmor-utils libapparmor-perl

diff --git a/demos/vpp-demo/vagrant_scripts/install-vpp.sh b/demos/vpp-demo/vagrant_scripts/install-vpp.sh
index f60542954d2bb8f60905b0c84c6c4a84971657a4..6f95ddcb471420397a65f7e3ccfe28ff0cc58cc3 100644 (file)
--- a/demos/vpp-demo/vagrant_scripts/install-vpp.sh
+++ b/demos/vpp-demo/vagrant_scripts/install-vpp.sh
@@ -4,12 +4,18 @@
 echo "Installing VPP..."
 sudo apt-get update --allow-unauthenticated
 sudo apt-get -y -f install --allow-unauthenticated
-sysctl -w vm.nr_hugepages=1024
+echo "resetting hugepages..."
+sudo sysctl -w vm.nr_hugepages=0
+sleep 3
+sudo sysctl -w vm.nr_hugepages=512
 HUGEPAGES=`sysctl -n  vm.nr_hugepages`
-if [ $HUGEPAGES != 1024 ]; then
-    echo "!!!!!!!!!!!!ERROR: Unable to get 1024 hugepages, only got $HUGEPAGES.  Cannot finish!!!!!!!!!!!!"
+if (($HUGEPAGES < 512 )); then
+    echo "!!!!!!!!!!!!ERROR: Unable to get 512 hugepages, only got $HUGEPAGES.  Cannot finish!!!!!!!!!!!!"
     exit
 fi
-sudo apt-get install -y --allow-unauthenticated vpp-lib vpp vpp-dev vpp-dpdk-dkms
+sudo apt-get install -y --allow-unauthenticated vpp-lib vpp vpp-dev vpp-plugins vpp-dpdk-dkms
+sudo sed -i 's/vm.nr_hugepages=1024/vm.nr_hugepages=512/' /etc/sysctl.d/80-vpp.conf
+sudo sed -i 's/vm.max_map_count=3096/vm.max_map_count=1200/' /etc/sysctl.d/80-vpp.conf
+sudo sed -i 's/kernel.shmmax=2147483648/kernel.shmmax=1073741824/' /etc/sysctl.d/80-vpp.conf
 echo "Installing VPP done."
 #sudo service vpp start
\ No newline at end of file