aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryalei wang <wylandrea@gmail.com>2018-08-22 00:47:30 +0000
committerGerrit Code Review <gerrit@fd.io>2018-08-22 00:47:30 +0000
commit9d488c4706a20a12554b9050d9b3313f8f67789d (patch)
treef858da22f8af54292f4050e5f81dfe3fd1af3bac
parentcaf867ce51cef2ce9696b6921da1df0fd206b0b0 (diff)
parentbfe55138cbaf64c19ea1d25af8c9b8005b6b8eaa (diff)
Merge "update vagrant for ubuntu 16.04"v18.07
-rw-r--r--stacks/lwip_stack/vagrant/Vagrantfile12
-rw-r--r--stacks/lwip_stack/vagrant/build.sh12
2 files changed, 12 insertions, 12 deletions
diff --git a/stacks/lwip_stack/vagrant/Vagrantfile b/stacks/lwip_stack/vagrant/Vagrantfile
index 3cfb883..cd59dbf 100644
--- a/stacks/lwip_stack/vagrant/Vagrantfile
+++ b/stacks/lwip_stack/vagrant/Vagrantfile
@@ -8,7 +8,7 @@ Vagrant.configure(2) do |config|
if distro == 'centos7'
config.vm.box = "puppetlabs/centos-7.2-64-nocm"
else
- config.vm.box = "fdio-csit/ubuntu-14.04.4_2016-05-25_1.0"
+ config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm"
end
config.vm.box_check_update = false
@@ -17,10 +17,10 @@ Vagrant.configure(2) do |config|
server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install_prereq.sh")
server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/DMM vagrant"
end
-# config.vm.define "dmm-stackx-client" do |client|
-# client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install_prereq.sh")
-# client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/dmm vagrant"
-# end
+ config.vm.define "dmm-stackx-client" do |client|
+ client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install_prereq.sh")
+ client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/DMM vagrant"
+ end
# vagrant-cachier caches apt/yum etc to speed subsequent
@@ -48,7 +48,7 @@ Vagrant.configure(2) do |config|
end
vmcpu=(ENV['DMM_VAGRANT_VMCPU'] || 4)
- vmram=(ENV['DMM_VAGRANT_VMRAM'] || 4096)
+ vmram=(ENV['DMM_VAGRANT_VMRAM'] || 5120)
config.ssh.forward_agent = true
config.ssh.forward_x11 = true
diff --git a/stacks/lwip_stack/vagrant/build.sh b/stacks/lwip_stack/vagrant/build.sh
index f189474..73c06dc 100644
--- a/stacks/lwip_stack/vagrant/build.sh
+++ b/stacks/lwip_stack/vagrant/build.sh
@@ -69,7 +69,7 @@ if [ "$OS_ID" == "ubuntu" ]; then
APT_OPTS="--assume-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
sudo apt-get update ${APT_OPTS}
- sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump libpcre3 libpcre3-dev zlibc zlib1g zlib1g-dev vim ethtool
+ sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump libpcre3 libpcre3-dev zlibc zlib1g zlib1g-dev vim ethtool unzip
elif [ "$OS_ID" == "debian" ]; then
echo "not tested for debian and exit"
exit 1
@@ -207,11 +207,11 @@ if [ "$OS_ID" == "centos" ]; then
ifmac=$(ifconfig enp0s8 | grep 'ether' | awk -F " " '{print $2}')
echo $ifmac
elif [ "$OS_ID" == "ubuntu" ]; then
- ifaddress1=$(ifconfig eth1 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}')
+ ifaddress1=$(ifconfig enp0s8 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}')
echo $ifaddress1
- ifaddresscut=$(ifconfig eth1 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}' | awk -F "." '{print $1"."$2"."$3}')
+ ifaddresscut=$(ifconfig enp0s8 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}' | awk -F "." '{print $1"."$2"."$3}')
echo $ifaddresscut
- ifmac=$(ifconfig eth1 | grep 'HWaddr' | awk -F " " '{print $5}')
+ ifmac=$(ifconfig enp0s8 | grep 'HWaddr' | awk -F " " '{print $5}')
echo $ifmac
fi
@@ -227,7 +227,7 @@ cd bin
if [ "$OS_ID" == "centos" ]; then
sed -i 's!eth7!enp0s8!1' ip_data.json
elif [ "$OS_ID" == "ubuntu" ]; then
- sed -i 's!eth7!eth1!1' ip_data.json
+ sed -i 's!eth7!enp0s8!1' ip_data.json
fi
sed -i 's!00:54:32:19:3d:19!'$ifmac'!1' ip_data.json
@@ -243,7 +243,7 @@ sed -i 's!192.168.1.254!'$ifaddresscut'.1!1' network_data_tonStack.json
if [ "$OS_ID" == "centos" ]; then
sed -i 's!eth7!enp0s8!1' network_data_tonStack.json
elif [ "$OS_ID" == "ubuntu" ]; then
- sed -i 's!eth7!eth1!1' network_data_tonStack.json
+ sed -i 's!eth7!enp0s8!1' network_data_tonStack.json
fi
sed -i 's!eth7!enp0s8!1' network_data_tonStack.json