From ca4a217a673d03f09b1a68e49b45c3af3f5626d0 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Tue, 12 Jul 2011 13:20:13 -0700
Subject: [PATCH] Updating rake and vagrant file.

vagrantfile - added the local repo location for our
internal boxes.

rakefile - fixed typo.
---
 Rakefile    |  2 +-
 Vagrantfile | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index 06ecf0c..428b178 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ namespace :build do
   end
   desc 'build out openstack on one node'
   task :single do
-    build(:single, env)
+    build(:all, env)
   end
 end
 
diff --git a/Vagrantfile b/Vagrantfile
index 8bc41c5..adbcda3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -11,7 +11,7 @@ Vagrant::Config.run do |config|
 
 
   config.vm.box = "#{box}"
-  config.vm.box_url = "#{remote_url_base}/#{box}.vbox"
+  config.vm.box_url = "http://faro.puppetlabs.lan/vagrant/#{box}.vbox"
   config.vm.customize do |vm|
     vm.memory_size = 768
     vm.cpu_count = 1
@@ -21,16 +21,10 @@ Vagrant::Config.run do |config|
 
   # the master runs apply to configure itself
   config.vm.define :puppetmaster do |pm|
-
-    pm.vm.forward_port("http", 8140, 8140)
     ssh_forward = ssh_forward + 1
     pm.vm.forward_port('ssh', 22, ssh_forward, :auto => true)
-    # hard-coding this b/c it is important
     pm.vm.network("#{net_base}.10")
-    #pm.vm.provision :puppet do |puppet|
-    #  puppet.manifest_file = "master.pp"
-    #  puppet.options = ["--certname","puppetmaster", '--modulepath', '/vagrant/modules']
-    #end
+    pm.vm.provision :shell, :path => 'scripts/run-puppetmaster.sh'
   end
 
   config.vm.define :all do |all|