updating box with puppet modules, and updated vagrant api

.vagrant/machines/default/virtualbox/action_provision

@@ -1 +1 @@
-1395191110
+1.5:c1c2530a-458f-4ba2-a351-f5cd1f0b4cfa

.vagrant/machines/default/virtualbox/action_set_name

@@ -1 +1 @@
-1395191066
+1401252377

.vagrant/machines/default/virtualbox/id

@@ -1 +1 @@
-8839498c-bd4b-40ac-a06e-ab448d12cec9
+c1c2530a-458f-4ba2-a351-f5cd1f0b4cfa

Vagrantfile

@@ -1,19 +1,20 @@
 box      = 'dev'
 url      = 'http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box'
 hostname = 'dev'
-ram      = '8192'
+ram      = '4028'
+VAGRANTFILE_API_VERSION = "2"
 
-Vagrant::Config.run do |config|
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = box
   config.vm.box_url = url
   config.vm.host_name = hostname
-
-  config.vm.customize [
-    'modifyvm', :id,
-    '--name', hostname,
-    '--memory', ram
-  ]
-
+ 
+  
+  config.vm.provider "virtualbox" do |v|
+  v.memory = ram
+  v.cpus = 2
+end
+  
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = 'puppet/manifests'
     puppet.manifest_file = 'site.pp'

puppet/manifests/site.pp

@@ -1 +1,3 @@
 include baseconfig
+include devPackages
+include ubuntuDesktop

puppet/modules/baseconfig/manifests/init.pp

@@ -17,12 +17,4 @@ class baseconfig {
       mode  => '0644',
       source => 'puppet:///modules/baseconfig/bashrc';
   }
-  
-  package { "gdm": ensure => "installed"}
-  package { "ubuntu-desktop": ensure => "installed"}
-  package { "ruby": ensure => "installed"}
-  package { "nodejs": ensure => "installed"}
-  package { "irssi": ensure => "installed"}
-  package { "git": ensure => "installed"}
-  package { "tmux": ensure => "installed"}
 }

puppet/modules/devPackages/manifests/init.pp

@@ -0,0 +1,9 @@
+class devPackages {
+	$Packages = ['cowsay', 'ruby', 'nodejs', 'irssi', 'git']
+  
+
+  package { "DevPackages": 
+  name=>$Packages,
+  ensure => "installed"
+  }
+}

puppet/modules/ubuntuDesktop/manifests/init.pp

@@ -0,0 +1,9 @@
+class ubuntuDesktop {
+	$UbuntuDesktop = ['gdm', 'ubuntu-desktop']
+  
+
+  package { "UbuntuDesktopPackages" : 
+  name=>$UbuntuDesktop,
+  ensure => "installed"
+  }
+}