[04/51] git commit: Update vagrant configuration for vagrant 1.1

[zw...@apache.org]

Update vagrant configuration for vagrant 1.1


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a9b65160
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a9b65160
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a9b65160

Branch: refs/heads/3.3.x
Commit: a9b6516089a843249d3cb978c746472cc99a3fe3
Parents: 70f224d
Author: James Peach <jp...@apache.org>
Authored: Fri Mar 15 16:39:56 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Mar 15 16:39:56 2013 -0700

----------------------------------------------------------------------
 Vagrantfile                 |   10 ++++++----
 contrib/manifests/debian.pp |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a9b65160/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index e316cae..d40799d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,20 +14,22 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
 
   # Default all VMs to 1GB.
-  config.vm.customize ["modifyvm", :id, "--memory", 1024]
+  config.vm.provider :virtualbox do |v|
+    v.customize ["modifyvm", :id, "--memory", 1024]
+  end
 
   # Mount the Traffic Server source code in a fixed location everywhere. Use NFS
   # because it's faster and vboxfs doesn't support links.
-  config.vm.share_folder "src", "/opt/src/trafficserver.git", ".", :nfs => true
+  config.vm.synced_folder ".", "/opt/src/trafficserver.git", :nfs => true
 
   # Ubuntu 12.04 LTS (Precise Pangolin)
   config.vm.define :precise64 do | config |
     config.vm.box = "precise64"
     config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-    config.vm.network :hostonly, "192.168.100.3"
+    config.vm.network :private_network, ip: "192.168.100.3"
     config.vm.provision :puppet do |puppet|
       puppet.manifests_path = "contrib/manifests"
       puppet.manifest_file = "debian.pp"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a9b65160/contrib/manifests/debian.pp
----------------------------------------------------------------------
diff --git a/contrib/manifests/debian.pp b/contrib/manifests/debian.pp
index a21d404..d495226 100644
--- a/contrib/manifests/debian.pp
+++ b/contrib/manifests/debian.pp
@@ -25,7 +25,7 @@ package {[
 
 # Development extras.
 package {[
-    'gdb', ,valgrind', 'git', 'ack-grep', 'curl', 'tmux', 'screen'
+    'gdb', 'valgrind', 'git', 'ack-grep', 'curl', 'tmux', 'screen'
   ]:
   ensure => latest
 }