summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2020-04-07 06:49:00 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-07 06:49:00 +0000
commitec83b3d3bda5501b20e05efae198202b29396c4a (patch)
tree4b8477c4be62d26c0d5ade96ab8843a08c638d3b
parent000e8365682ada294687a2c45adc34979cdb093d (diff)
parent55ab809102cec854d2ad768efcc0aa67956c9c75 (diff)
Merge "Revert "Update Vagrant VM Version""
-rw-r--r--kud/hosting_providers/vagrant/Vagrantfile8
-rw-r--r--kud/hosting_providers/vagrant/config/default.yml2
-rw-r--r--kud/hosting_providers/vagrant/config/samples/pdf.yml.aio2
3 files changed, 6 insertions, 6 deletions
diff --git a/kud/hosting_providers/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile
index 670f50c8..2d1b5ab4 100644
--- a/kud/hosting_providers/vagrant/Vagrantfile
+++ b/kud/hosting_providers/vagrant/Vagrantfile
@@ -10,8 +10,8 @@
##############################################################################
box = {
- :virtualbox => { :name => 'elastic/ubuntu-18.04-x86_64', :version => '20191013.0.0'},
- :libvirt => { :name => 'generic/ubuntu1804', :version=> '2.0.6'}
+ :virtualbox => { :name => 'elastic/ubuntu-16.04-x86_64', :version => '20180708.0.0' },
+ :libvirt => { :name => 'elastic/ubuntu-16.04-x86_64', :version=> '20180210.0.0'}
}
require 'yaml'
@@ -122,8 +122,8 @@ Vagrant.configure("2") do |config|
installer.vm.provision 'shell', privileged: false do |sh|
sh.env = {'KUD_PLUGIN_ENABLED': 'false', 'OVN_CENTRAL_INTERFACE': 'eth1'}
sh.inline = <<-SHELL
- cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub
- cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa
+ cp /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub
+ cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa
chown vagrant /home/vagrant/.ssh/id_rsa
chmod 400 /home/vagrant/.ssh/id_rsa
cd /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/ && ./installer.sh | tee kud_installer.log
diff --git a/kud/hosting_providers/vagrant/config/default.yml b/kud/hosting_providers/vagrant/config/default.yml
index 094c3594..10b93663 100644
--- a/kud/hosting_providers/vagrant/config/default.yml
+++ b/kud/hosting_providers/vagrant/config/default.yml
@@ -37,7 +37,7 @@
memory: 32768
cpus: 16
volumes:
- - name: sdb
+ - name: sda
size: 50
mount: /var/lib/docker/
roles:
diff --git a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio
index a87f967e..48a3c938 100644
--- a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio
+++ b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio
@@ -13,7 +13,7 @@
memory: 32768
cpus: 16
volumes:
- - name: sdb
+ - name: sda
size: 50
mount: /var/lib/docker/
roles: