Added the required initialization to start the docker swarm cluster.
Converted yet more dos format files to unix format. Updated the
document on building voltha on a QEMU/KVM virtualization environment
using vagrant. Added a configuration file for the install vagrant to
eventually enable multiple users on a single compute node all able to
run independent voltha docker swarm clusters as VMs. More work is
required to finalize multi-user test mode which will be submitted in a
subsequent update.
This update continues to address Jira VOL-6
Change-Id: I88bc41aa6484877cb76ad38f8bab894f141cebdb
diff --git a/install/Vagrantfile b/install/Vagrantfile
index a07ec95..dccee81 100644
--- a/install/Vagrantfile
+++ b/install/Vagrantfile
@@ -3,13 +3,18 @@
# This Vagrantfile is used for testing the installer. It creates 3 servers
# with a vanilla ubutu server image on it.
+require 'yaml'
+
+# Load the settings which are tweaked by the installer to avoid naming conflicts
+settings = YAML.load_file 'settings.vagrant.yaml'
+
Vagrant.configure(2) do |config|
config.vm.synced_folder ".", "/vagrant", disabled: true
(1..3).each do |i|
- config.vm.define "ha-serv#{i}" do |d|
+ config.vm.define "#{settings['server_name']}#{i}" do |d|
d.ssh.forward_agent = true
- d.vm.box = "ubuntu1604"
- d.vm.hostname = "ha-serv#{i}"
+ d.vm.box = settings["box_source"]
+ d.vm.hostname = "#{settings['server_name']}#{i}"
d.vm.provider "libvirt" do |v|
v.memory = 6144
end
@@ -21,42 +26,3 @@
end
end
-
-#Vagrant.configure(2) do |config|
-#
-# config.vm.synced_folder ".", "/vagrant", disabled: true
-# if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-# puts("Configuring for windows")
-# config.vm.synced_folder "../../..", "/cord", mount_options: ["dmode=700,fmode=600"]
-# Box = "ubuntu/xenial64"
-# Provider = "virtualbox"
-# elsif RUBY_PLATFORM =~ /linux/
-# puts("Configuring for linux")
-# config.vm.synced_folder "../../..", "/cord", type: "nfs"
-# Box = "ubuntu1604"
-# Provider = "libvirt"
-# else
-# puts("Configuring for other")
-# config.vm.synced_folder "../../..", "/cord"
-# Box = "ubuntu/xenial64"
-# Provider = "virtualbox"
-# end
-#
-# config.vm.define "voltha" do |d|
-# d.ssh.forward_agent = true
-# d.vm.box = Box
-# d.vm.hostname = "voltha"
-# d.vm.network "private_network", ip: "10.100.198.220"
-# #d.vm.provision :shell, path: "ansible/scripts/bootstrap_ansible.sh"
-# #d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/incubator/voltha/ansible/voltha.yml -c local"
-# #d.vm.provision :shell, inline: "cd /cord/incubator/voltha && source env.sh && make install-protoc && chmod 777 /tmp/fluentd"
-# d.vm.provider Provider do |v|
-# v.memory = 6144
-# end
-# end
-#
-# if Vagrant.has_plugin?("vagrant-cachier")
-# config.cache.scope = :box
-# end
-#
-#end