swap for behemoths

use the last letter in range for swaP device

had to upgrade aws/ohai/compat_resource recipes

Author: adriaanm

attributes/worker.rb

@@ -75,6 +75,13 @@
     publisher = (node.name =~ /.*-publish.*/) != nil # TODO: use tag?
     lightWorker = publisher  # TODO: better heuristic...
 
+    if !lightWorker
+      default['ebs']['volumes']['none']['size']      = 16
+      default['ebs']['volumes']['none']['dev']       = "/dev/sdp"
+      default['ebs']['volumes']['none']['fstype']    = "swap"
+      default['ebs']['volumes']['none']['mountopts'] = "sw"
+    end
+
     override['sbt']['launcher_path'] = '/usr/local/lib/share/sbt-launch.jar'
 
     default['graphviz']['url']      = 'https://dl.dropboxusercontent.com/u/12862572/graphviz_2.28.0-1_amd64.deb'

recipes/_config-ebs.rb

@@ -43,31 +43,56 @@
     else
       device = node[:platform_family] == 'debian' ? ebsConfig['dev'].gsub(%r{^/dev/sd}, '/dev/xvd') : ebsConfig['dev']
 
-      execute 'mkfs' do
-        command "mkfs -t #{ebsConfig['fstype']} #{device}"
-        not_if do
-          BlockDevice.wait_for(device)
-          system("blkid -s TYPE -o value #{device}")
+      case ebsConfig['fstype']
+      when "swap"
+        execute 'mkswap' do
+          command "mkswap #{device}"
+          not_if do
+            BlockDevice.wait_for(device)
+            system("blkid -s TYPE -o value #{device}")
+          end
         end
-      end
 
-      # workaround for when user doesn't exist during bootstrap
-#      user ebsConfig['user'] do
-#      end
+        execute 'swapon' do
+          command "swapon #{device}"
+        end
 
-      directory mountPoint do
-        owner ebsConfig['user']
-        mode 0755
+        mount mountPoint do
+          device  device
+          fstype  ebsConfig['fstype']
+          options ebsConfig['mountopts']
 
-        action :create
-      end
+          pass    0
+          action [:enable]
+        end
+
+      else
+        execute 'mkfs' do
+          command "mkfs -t #{ebsConfig['fstype']} #{device}"
+          not_if do
+            BlockDevice.wait_for(device)
+            system("blkid -s TYPE -o value #{device}")
+          end
+        end
 
-      mount mountPoint do
-        device  device
-        fstype  ebsConfig['fstype']
-        options ebsConfig['mountopts']
+        # workaround for when user doesn't exist during bootstrap
+  #      user ebsConfig['user'] do
+  #      end
 
-        action [:mount, :enable]
+        directory mountPoint do
+          owner ebsConfig['user']
+          mode 0755
+
+          action :create
+        end
+
+        mount mountPoint do
+          device  device
+          fstype  ebsConfig['fstype']
+          options ebsConfig['mountopts']
+
+          action [:mount, :enable]
+        end
       end
     end
   end