diff options
| -rw-r--r-- | INFO | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 8 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_basic/Vagrantfile | 2 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_basic/deploy.sh | 8 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_multus/Vagrantfile | 1 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_multus/deploy.sh | 8 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_ovsdpdk/Vagrantfile | 1 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_ovsdpdk/deploy.sh | 8 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/Vagrantfile | 1 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_virtlet/deploy.sh | 8 |
10 files changed, 45 insertions, 2 deletions
@@ -15,7 +15,7 @@ Committers: jiaxuan@chinamobile.com gergely.csatari@nokia.com yu.peng36@zte.com.cn -matthew.lijun@huawei.com +lijun_1203@126.com wassim.haddad@ericsson.com heikki.mahkonen@ericsson.com akapadia@aarnanetworks.com diff --git a/ci/deploy.sh b/ci/deploy.sh index d1a9d86..0d831b4 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -15,4 +15,10 @@ # limitations under the License. # -echo "deploy" +set -ex + +../src/vagrant/kubeadm_basic/deploy.sh +#enable later +#../src/vagrant/kubeadm_ovsdpdk/deploy.sh +#../src/vagrant/kubeadm_multus/deploy.sh +#../src/vagrant/kubeadm_virtlet/deploy.sh diff --git a/src/vagrant/kubeadm_basic/Vagrantfile b/src/vagrant/kubeadm_basic/Vagrantfile index f1e7aac..10bf414 100644 --- a/src/vagrant/kubeadm_basic/Vagrantfile +++ b/src/vagrant/kubeadm_basic/Vagrantfile @@ -6,6 +6,7 @@ Vagrant.configure("2") do |config| config.vm.box = "bento/ubuntu-16.04" config.vm.synced_folder "../..", "/src" config.vm.provision "shell", path: "host_setup.sh", privileged: false + config.vm.provider :virtualbox do |vb| vb.customize ["modifyvm", :id, "--memory", 4096] vb.customize ["modifyvm", :id, "--cpus", 4] @@ -13,6 +14,7 @@ Vagrant.configure("2") do |config| vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] + vb.destroy_unused_network_interfaces = true end config.vm.define "master" do |config| diff --git a/src/vagrant/kubeadm_basic/deploy.sh b/src/vagrant/kubeadm_basic/deploy.sh new file mode 100755 index 0000000..ae9f798 --- /dev/null +++ b/src/vagrant/kubeadm_basic/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -ex +HOME="$(dirname `readlink -f $0`)" + +cd $HOME +vagrant up +vagrant destroy -f diff --git a/src/vagrant/kubeadm_multus/Vagrantfile b/src/vagrant/kubeadm_multus/Vagrantfile index aa3792f..da5c5d3 100644 --- a/src/vagrant/kubeadm_multus/Vagrantfile +++ b/src/vagrant/kubeadm_multus/Vagrantfile @@ -10,6 +10,7 @@ Vagrant.configure("2") do |config| vb.customize ["modifyvm", :id, "--cpus", 4] vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] + vb.destroy_unused_network_interfaces = true end config.vm.provision "shell", path: "host_setup.sh", privileged: false diff --git a/src/vagrant/kubeadm_multus/deploy.sh b/src/vagrant/kubeadm_multus/deploy.sh new file mode 100755 index 0000000..ae9f798 --- /dev/null +++ b/src/vagrant/kubeadm_multus/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -ex +HOME="$(dirname `readlink -f $0`)" + +cd $HOME +vagrant up +vagrant destroy -f diff --git a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile index f1e7aac..a6ba7aa 100644 --- a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile +++ b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile @@ -13,6 +13,7 @@ Vagrant.configure("2") do |config| vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] + vb.destroy_unused_network_interfaces = true end config.vm.define "master" do |config| diff --git a/src/vagrant/kubeadm_ovsdpdk/deploy.sh b/src/vagrant/kubeadm_ovsdpdk/deploy.sh new file mode 100755 index 0000000..ae9f798 --- /dev/null +++ b/src/vagrant/kubeadm_ovsdpdk/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -ex +HOME="$(dirname `readlink -f $0`)" + +cd $HOME +vagrant up +vagrant destroy -f diff --git a/src/vagrant/kubeadm_virtlet/Vagrantfile b/src/vagrant/kubeadm_virtlet/Vagrantfile index aa3792f..da5c5d3 100644 --- a/src/vagrant/kubeadm_virtlet/Vagrantfile +++ b/src/vagrant/kubeadm_virtlet/Vagrantfile @@ -10,6 +10,7 @@ Vagrant.configure("2") do |config| vb.customize ["modifyvm", :id, "--cpus", 4] vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] + vb.destroy_unused_network_interfaces = true end config.vm.provision "shell", path: "host_setup.sh", privileged: false diff --git a/src/vagrant/kubeadm_virtlet/deploy.sh b/src/vagrant/kubeadm_virtlet/deploy.sh new file mode 100755 index 0000000..ae9f798 --- /dev/null +++ b/src/vagrant/kubeadm_virtlet/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -ex +HOME="$(dirname `readlink -f $0`)" + +cd $HOME +vagrant up +vagrant destroy -f |