adding testbox to Vagrantfile
Change-Id: Ibc4f06ebd916d33ca3a2f398d5fd228f00b56a91
diff --git a/Vagrantfile b/Vagrantfile
index 80bba19..ec4565a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -50,6 +50,19 @@
end
end
+ config.vm.define "testbox" do |d|
+ d.vm.box = "fgrehm/trusty64-lxc"
+ d.ssh.forward_agent = true
+ d.vm.hostname = "testbox"
+ d.vm.network "private_network", ip: "10.0.3.100", lxc__bridge_name: 'lxcbr0'
+ d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
+ d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/corddev.yml -c local"
+ config.vm.provider :lxc do |lxc|
+ # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
+ lxc.customize 'cgroup.memory.limit_in_bytes', '2048M'
+ end
+ end
+
(1..3).each do |i|
# Defining VM properties
diff --git a/Vagrantfile-lxc b/Vagrantfile-lxc
deleted file mode 100644
index b4433ae..0000000
--- a/Vagrantfile-lxc
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-
- if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
- config.vm.synced_folder "..", "/cord", mount_options: ["dmode=700,fmode=600"]
- else
- config.vm.synced_folder "..", "/cord"
- end
-
- config.vm.define "corddev" do |d|
- d.ssh.forward_agent = true
- d.vm.box = "ubuntu/trusty64"
- d.vm.hostname = "corddev"
- d.vm.network "private_network", ip: "10.100.198.200"
- d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/corddev.yml -c local"
- d.vm.provider "virtualbox" do |v|
- v.memory = 2048
- end
- end
-
- config.vm.define "prod" do |d|
- d.vm.box = "ubuntu/trusty64"
- d.vm.synced_folder '.', '/vagrant', disable: true
- d.vm.hostname = "prod"
- d.vm.network "private_network", ip: "10.100.198.201"
- d.vm.network "private_network", ip: "0.0.0.0", virtualbox__intnet: "cord-test-network"
- d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/prod.yml -c local"
- d.vm.provider "virtualbox" do |v|
- v.memory = 2048
- end
- end
-
- config.vm.define "switch" do |s|
- s.vm.box = "ubuntu/trusty64"
- s.vm.hostname = "fakeswitch"
- s.vm.network "private_network", ip: "10.100.198.253"
- s.vm.network "private_network",
- type: "dhcp",
- virtualbox__intnet: "cord-test-network",
- mac: "cc37ab000001"
- s.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/fakeswitch.yml -c local"
- s.vm.provider "virtualbox" do |v|
- v.memory = 1048
- v.name = "fakeswitch"
- end
- end
-
- config.vm.define "testbox" do |d|
- d.vm.box = "fgrehm/trusty64-lxc"
- d.ssh.forward_agent = true
- d.vm.hostname = "testbox"
- d.vm.network "private_network", ip: "10.0.3.100", lxc__bridge_name: 'lxcbr0'
- d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/corddev.yml -c local"
- config.vm.provider :lxc do |lxc|
- # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
- lxc.customize 'cgroup.memory.limit_in_bytes', '2048M'
- end
- end
-
- (1..3).each do |i|
- # Defining VM properties
- config.vm.define "compute_node#{i}" do |c|
- c.vm.box = "clink15/pxe"
- c.vm.synced_folder '.', '/vagrant', disable: true
- c.vm.communicator = "none"
- c.vm.hostname = "computenode"
- c.vm.network "private_network",
- adapter: "1",
- type: "dhcp",
- auto_config: false,
- virtualbox__intnet: "cord-test-network"
- c.vm.provider "virtualbox" do |v|
- v.name = "compute_node#{i}"
- v.memory = 1048
- v.gui = "true"
- end
- end
- end
-
- if Vagrant.has_plugin?("vagrant-cachier")
- config.cache.scope = :box
- end
-
-end
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
index ec7b940..aea13bd 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -1,11 +1,11 @@
# Deployment configuration for a phyical hardware POD
---
seedServer:
- ip: '10.90.0.2'
+ ip: '10.90.0.251'
# User name and password used by Ansible to connect to the host for remote
# provisioning
- user: 'admin'
- password: 'onos_test'
+ user: 'ubuntu'
+ password: 'ubuntu'
# Network address information for the head node:
#
# fabric_ip - the IP address and mask bits to be used to configure the network
@@ -22,7 +22,7 @@
# NAT-ed through this interface
fabric_ip: '10.6.1.1/24'
management_ip: '10.6.0.1/24'
- external_ip: '10.90.0.2/24'
+ external_ip: '10.90.0.251/24'
external_iface: 'eth0'
skipTags: