From: Le Yao <le.yao@intel.com>
Date: Tue, 7 Apr 2020 06:14:21 +0000 (+0000)
Subject: Revert "Update Vagrant VM Version"
X-Git-Tag: 0.6.0~29^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F105206%2F1;p=multicloud%2Fk8s.git

Revert "Update Vagrant VM Version"

This reverts commit f802b87c1d3caecc74789d435358d4f8ff2555a3.

Reason for revert: Will rebuild with Nameserver issue solved

Issue-ID: MULTICLOUD-1004
Change-Id: Ieafee94e4fe909c30ef8a4167d242f40e114d767
Signed-off-by: Yao Le <le.yao@intel.com>
---

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: