From 0555b79e8d1c601436f36ed5fc55f3a77f1ddc7f Mon Sep 17 00:00:00 2001 From: James Martin Date: Thu, 6 Dec 2012 22:14:27 -0500 Subject: [PATCH] Updated to suppor 2 nics. Signed-off-by: Rohit Yadav --- tools/devcloud/Vagrantfile | 4 +++- .../puppet/modules/devcloudinitial/files/interfaces | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/devcloud/Vagrantfile b/tools/devcloud/Vagrantfile index d229d0e3765..9e6bfae0acc 100644 --- a/tools/devcloud/Vagrantfile +++ b/tools/devcloud/Vagrantfile @@ -19,6 +19,7 @@ # under the License. Vagrant::Config.run do |config| + config.vm.network :hostonly, "192.168.56.10" #config.vm.box = "devcloud" config.vm.box = "devcloudbase-xen" #config.vm.box_url = "http://basho-cloudstack.s3.amazonaws.com/devcloud.box" @@ -28,7 +29,7 @@ Vagrant::Config.run do |config| config.vm.host_name = "devcloud.local" # Uncomment this line to enable the console for debugging the # build process. - # config.vm.boot_mode = :gui + config.vm.boot_mode = :gui # Setup port forwarding config.vm.forward_port 22, 7222 @@ -43,6 +44,7 @@ Vagrant::Config.run do |config| # Ensure the VM has the right virtual resources #config.vm. config.vm.customize ["modifyvm", :id, "--memory", 2048] + config.vm.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] config.vm.provision :shell, :path => "waitforxe.sh" config.vm.provision :puppet do |puppet| puppet.with_ssh = true diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces index 72cb8f0cb2a..0c197209d10 100644 --- a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces +++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces @@ -24,8 +24,14 @@ allow-hotplug eth1 iface eth1 inet manual auto xenbr0 -iface xenbr0 inet static +iface xenbr0 inet dhcp bridge_ports eth0 + dns_nameservers 8.8.8.8 8.8.4.4 + post-up route add default gw 10.0.2.2 + +auto xenbr1 +iface xenbr1 inet static + bridge_ports eth1 address 192.168.56.10 netmask 255.255.255.0 network 192.168.56.0 @@ -34,11 +40,6 @@ iface xenbr0 inet static dns_nameservers 8.8.8.8 8.8.4.4 post-up route del default gw 192.168.56.1; route add default gw 192.168.56.1 metric 100; -auto xenbr1 -iface xenbr1 inet dhcp - bridge_ports eth1 - dns_nameservers 8.8.8.8 8.8.4.4 - post-up route add default gw 10.0.2.2 pre-up iptables-save < /etc/iptables.save pre-up /etc/init.d/ebtables load