summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-12-01 20:49:05 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-01 20:49:05 +0000
commite62aae6b5d079c5175441686d49364b71741f6d9 (patch)
tree76d811fc8b05fffc11a08a3f6f55c4de785f854c
parent15c739e0bfa1cd79c844867a4866fff2ce8e1f59 (diff)
parent9c525e4772bd9aba9741976e85932a854be6f7cb (diff)
Merge "Fix vagrant-libvirtd network adapter info"
-rw-r--r--bootstrap/vagrant-onap/Vagrantfile40
-rw-r--r--bootstrap/vagrant-onap/doc/source/install/index.rst8
2 files changed, 30 insertions, 18 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile
index a0f3a1926..ef304a21e 100644
--- a/bootstrap/vagrant-onap/Vagrantfile
+++ b/bootstrap/vagrant-onap/Vagrantfile
@@ -34,7 +34,7 @@ configuration = {
box = {
:virtualbox => 'ubuntu/trusty64',
- :libvirt => 'sputnik13/trusty64',
+ :libvirt => 'elastic/ubuntu-14.04-x86_64',
:openstack => nil
}
@@ -357,11 +357,31 @@ Vagrant.configure("2") do |config|
vbox.customize ['modifyvm', :id, "--cpuexecutioncap", node[:cpu]]
vbox.customize ['modifyvm', :id, "--cpus", node[:cpus]]
vbox.customize ["modifyvm", :id, "--memory", node[:ram]]
+
+ # Set Network
+ nodeconfig.vm.network :private_network,
+ :adapter => 2,
+ :name => net_interface,
+ :ip => node[:ips][0]
+
+ nodeconfig.vm.network :private_network,
+ :adapter => 3,
+ :ip => node[:ips][1],
+ :type => :static
end
nodeconfig.vm.provider "libvirt" do |lbox|
lbox.memory = node[:ram]
lbox.nested = true
+ lbox.cpu_mode = 'host-passthrough'
+
+ # Set Network
+ nodeconfig.vm.network :private_network,
+ :ip => node[:ips][0]
+
+ nodeconfig.vm.network :private_network,
+ :ip => node[:ips][1],
+ :type => :static
end
nodeconfig.vm.provider :openstack do |obox|
@@ -383,10 +403,13 @@ Vagrant.configure("2") do |config|
end
# Set Box type
- nodeconfig.vm.box = box[provider]
if "openstack" == node[:name]
- nodeconfig.vm.box = "ubuntu/xenial64"
+ box = {
+ :virtualbox => 'ubuntu/xenial64',
+ :libvirt => 'elastic/ubuntu-16.04-x86_64'
+ }
end
+ nodeconfig.vm.box = box[provider]
# Set Node name
nodeconfig.vm.hostname = node[:name]
@@ -399,17 +422,6 @@ Vagrant.configure("2") do |config|
nodeconfig.vm.synced_folder '~/.m2', '/root/.m2/', create: true
end
- # Set Network
- nodeconfig.vm.network :private_network,
- :adapter => 2,
- :name => net_interface,
- :ip => node[:ips][0]
-
- nodeconfig.vm.network :private_network,
- :adapter => 3,
- :ip => node[:ips][1],
- :type => :static
-
# Specific settings:
# Set Storage (For SDC or All-in-one)
diff --git a/bootstrap/vagrant-onap/doc/source/install/index.rst b/bootstrap/vagrant-onap/doc/source/install/index.rst
index 6691b4f0d..83c68b66f 100644
--- a/bootstrap/vagrant-onap/doc/source/install/index.rst
+++ b/bootstrap/vagrant-onap/doc/source/install/index.rst
@@ -15,8 +15,8 @@ Ubuntu 14.04 ("Trusty")
.. code-block:: console
- $ wget -q https://releases.hashicorp.com/vagrant/1.9.7/vagrant_1.9.7_x86_64.deb
- $ sudo dpkg -i vagrant_1.9.7_x86_64.deb
+ $ wget -q https://releases.hashicorp.com/vagrant/2.0.1/vagrant_2.0.1_x86_64.deb
+ $ sudo dpkg -i vagrant_2.0.1_x86_64.deb
$ echo "deb http://download.virtualbox.org/virtualbox/debian trusty contrib" >> /etc/apt/sources.list
$ wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
$ wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
@@ -30,8 +30,8 @@ CentOS
.. code-block:: console
- $ wget -q https://releases.hashicorp.com/vagrant/1.9.7/vagrant_1.9.7_x86_64.rpm
- $ sudo yum install vagrant_1.9.7_x86_64.rpm
+ $ wget -q https://releases.hashicorp.com/vagrant/2.0.1/vagrant_2.0.1_x86_64.rpm
+ $ sudo yum install vagrant_2.0.1_x86_64.rpm
$ wget -q http://download.virtualbox.org/virtualbox/rpm/rhel/virtualbox.repo -P /etc/yum.repos.d
$ sudo yum --enablerepo=epel install dkms
$ wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | rpm --import -