summaryrefslogtreecommitdiffstats
path: root/kud/hosting_providers
diff options
context:
space:
mode:
authorYao Le <le.yao@intel.com>2020-04-07 23:34:16 +0800
committerYao Le <le.yao@intel.com>2020-04-07 23:34:16 +0800
commitab80001f123e7a9e335ad404eb273b6e657fc2b5 (patch)
tree6588634df948ad811ff11b2b66103509ee5b6dd4 /kud/hosting_providers
parentec83b3d3bda5501b20e05efae198202b29396c4a (diff)
Update Vagrant VM image to Ubuntu-18.04
Fix bug ICN-260 KUD Multi Vagrant 18.04 issue Fix bug ICN-303 Compute01 no spcae left in KUD Multi Vagrant Fix bug ICN-285 Nameserver issues behind a proxy Issue-ID: MULTICLOUD-1004 Signed-off-by: Yao Le <le.yao@intel.com> Change-Id: I9e5c6c0e618ebd63babe650f06ca21ff10669cc4
Diffstat (limited to 'kud/hosting_providers')
-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 2d1b5ab4..eb5e5cdc 100644
--- a/kud/hosting_providers/vagrant/Vagrantfile
+++ b/kud/hosting_providers/vagrant/Vagrantfile
@@ -10,8 +10,8 @@
##############################################################################
box = {
- :virtualbox => { :name => 'elastic/ubuntu-16.04-x86_64', :version => '20180708.0.0' },
- :libvirt => { :name => 'elastic/ubuntu-16.04-x86_64', :version=> '20180210.0.0'}
+ :virtualbox => { :name => 'elastic/ubuntu-18.04-x86_64', :version => '20191013.0.0'},
+ :libvirt => { :name => 'intergratedcloudnative/ubuntu1804', :version => '1.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 /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub
- cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa
+ 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
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 10b93663..094c3594 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: sda
+ - name: sdb
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 48a3c938..a87f967e 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: sda
+ - name: sdb
size: 50
mount: /var/lib/docker/
roles: