From 220141cdbe5dd27487777dd5bc1ecf164859e026 Mon Sep 17 00:00:00 2001
From: Tommy Parnell <parnell.tommy@hotmail.com>
Date: Wed, 28 May 2014 00:47:16 -0400
Subject: [PATCH] updating box with puppet modules, and updated vagrant api

---
 .../default/virtualbox/action_provision       |  2 +-
 .../default/virtualbox/action_set_name        |  2 +-
 .vagrant/machines/default/virtualbox/id       |  2 +-
 Vagrantfile                                   | 19 ++++++++++---------
 puppet/manifests/site.pp                      |  2 ++
 puppet/modules/baseconfig/manifests/init.pp   |  8 --------
 puppet/modules/devPackages/manifests/init.pp  |  9 +++++++++
 .../modules/ubuntuDesktop/manifests/init.pp   |  9 +++++++++
 8 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 puppet/modules/devPackages/manifests/init.pp
 create mode 100644 puppet/modules/ubuntuDesktop/manifests/init.pp

diff --git a/.vagrant/machines/default/virtualbox/action_provision b/.vagrant/machines/default/virtualbox/action_provision
index 76444ed..e3087a3 100644
--- a/.vagrant/machines/default/virtualbox/action_provision
+++ b/.vagrant/machines/default/virtualbox/action_provision
@@ -1 +1 @@
-1395191110
\ No newline at end of file
+1.5:c1c2530a-458f-4ba2-a351-f5cd1f0b4cfa
\ No newline at end of file
diff --git a/.vagrant/machines/default/virtualbox/action_set_name b/.vagrant/machines/default/virtualbox/action_set_name
index 889ef08..754cbd6 100644
--- a/.vagrant/machines/default/virtualbox/action_set_name
+++ b/.vagrant/machines/default/virtualbox/action_set_name
@@ -1 +1 @@
-1395191066
\ No newline at end of file
+1401252377
\ No newline at end of file
diff --git a/.vagrant/machines/default/virtualbox/id b/.vagrant/machines/default/virtualbox/id
index b27b527..7df2c88 100644
--- a/.vagrant/machines/default/virtualbox/id
+++ b/.vagrant/machines/default/virtualbox/id
@@ -1 +1 @@
-8839498c-bd4b-40ac-a06e-ab448d12cec9
\ No newline at end of file
+c1c2530a-458f-4ba2-a351-f5cd1f0b4cfa
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
index d30d621..3d2499a 100644
--- a/Vagrantfile
+++ b/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'
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 6853fdb..32b302e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1 +1,3 @@
 include baseconfig
+include devPackages
+include ubuntuDesktop
\ No newline at end of file
diff --git a/puppet/modules/baseconfig/manifests/init.pp b/puppet/modules/baseconfig/manifests/init.pp
index 0110af2..30dc5b2 100644
--- a/puppet/modules/baseconfig/manifests/init.pp
+++ b/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"}
 }
\ No newline at end of file
diff --git a/puppet/modules/devPackages/manifests/init.pp b/puppet/modules/devPackages/manifests/init.pp
new file mode 100644
index 0000000..a62e3c6
--- /dev/null
+++ b/puppet/modules/devPackages/manifests/init.pp
@@ -0,0 +1,9 @@
+class devPackages {
+	$Packages = ['cowsay', 'ruby', 'nodejs', 'irssi', 'git']
+  
+
+  package { "DevPackages": 
+  name=>$Packages,
+  ensure => "installed"
+  }
+}
\ No newline at end of file
diff --git a/puppet/modules/ubuntuDesktop/manifests/init.pp b/puppet/modules/ubuntuDesktop/manifests/init.pp
new file mode 100644
index 0000000..89e8033
--- /dev/null
+++ b/puppet/modules/ubuntuDesktop/manifests/init.pp
@@ -0,0 +1,9 @@
+class ubuntuDesktop {
+	$UbuntuDesktop = ['gdm', 'ubuntu-desktop']
+  
+
+  package { "UbuntuDesktopPackages" : 
+  name=>$UbuntuDesktop,
+  ensure => "installed"
+  }
+}
\ No newline at end of file