Classify all our existing agent'd nodes

The node == role mapping isn't /great/ but because we have nodes that server a
number of functions, we can't really say 1 logical role (e.g. 'webserver') can
map to 1 logical node

dist/role/manifests/edamame.pp

@@ -0,0 +1,4 @@
+#
+# Edamame is a VM with 2x CPUs and 2GB of RAM at the OSUOSL
+class role::edamame {
+}

dist/role/manifests/spinach.pp

@@ -0,0 +1,4 @@
+#
+# spinach is an Ubuntu VM in the Rackspace Cloud
+class role::spinach {
+}

manifests/site.pp

@@ -1,13 +1,5 @@
 ## site.pp ##
 
-# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
-# used when an agent connects to a master and asks for an updated configuration.
-#
-# Global objects like filebuckets and resource defaults should go in this file,
-# as should the default node definition. (The default node can be omitted
-# if you use the console and don't define any other nodes in site.pp. See
-# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
-# node definitions.)
 
 ## Active Configurations ##
 
@@ -36,7 +28,20 @@ File { backup => 'main' }
 # specified in the console for that node.
 
 node default {
-  # This is where you can declare classes for all nodes.
-  # Example:
-  #   class { 'my_class': }
+}
+
+
+# artichoke
+node 'jenkins-puppet.osuosl.org' {
+  include role::puppetmaster
+}
+
+# edamame
+node 'jenkins-confluence.osuosl.org' {
+  include role::edamame
+}
+
+# spinach
+node 'spinach.jenkins-ci.org' {
+  include role::spinach
 }

spec/classes/role/edamame_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'role::edamame' do
+  it { should compile }
+end

spec/classes/role/spinach_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'role::spinach' do
+  it { should compile }
+end