summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiran Kamineni <kiran.k.kamineni@intel.com>2019-10-24 21:56:55 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-24 21:56:55 +0000
commitf2085c1400f9c70066e667a3e1df4ebfb1bbe764 (patch)
treee5098e15dc1b542eeb130f14dfa44e6abbde55ae
parenteaa37b56ecb872c85e1ac1f7c5ca8398ae340f23 (diff)
parenta23a81b2e185a19ea19b8e57c7b66ea78fe5bc64 (diff)
Merge "Update KUD to switch to Ubuntu 18.04"
-rw-r--r--kud/deployment_infra/playbooks/Debian.yml2
-rw-r--r--kud/hosting_providers/vagrant/Vagrantfile4
-rwxr-xr-xkud/hosting_providers/vagrant/installer.sh1
3 files changed, 3 insertions, 4 deletions
diff --git a/kud/deployment_infra/playbooks/Debian.yml b/kud/deployment_infra/playbooks/Debian.yml
index 96357fe2..b9725b2d 100644
--- a/kud/deployment_infra/playbooks/Debian.yml
+++ b/kud/deployment_infra/playbooks/Debian.yml
@@ -11,8 +11,6 @@ openvswitch_service: openvswitch-switch
openvswitch_pkgs:
- openvswitch-common
- openvswitch-switch
- - libopenvswitch
- - openvswitch-datapath-dkms
ovn_central_service: ovn-central
ovn_central_pkgs:
- ovn-central # <= 2.8.1-1
diff --git a/kud/hosting_providers/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile
index 2d1b5ab4..58251fe9 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 => 'peru/ubuntu-18.04-server-amd64'}
}
require 'yaml'
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index 94023524..5cc701db 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -107,6 +107,7 @@ function install_k8s {
local_release_dir=$(grep "local_release_dir" $kud_inventory_folder/group_vars/k8s-cluster.yml | awk -F "\"" '{print $2}')
local tarball=v$version.tar.gz
sudo apt-get install -y sshpass make unzip # install make to run mitogen target and unzip is mitogen playbook dependency
+ sudo apt-get install -y gnupg2 software-properties-common
_install_docker
_install_ansible
wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball