rubber 2.0.0.pre2 → 2.0.0.pre3

data/lib/rubber/recipes/rubber/setup.rb

@@ -408,7 +408,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.update("#{name}.#{ic.name}", instance_item.external_ip)
+          provider.update("#{name}.#{instance_item.full_name}", instance_item.external_ip)
         end
       end
     end
@@ -426,7 +426,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.destroy("#{name}.#{ic.name}")
+          provider.destroy("#{name}.#{instance_item.full_name}")
         end
       end
     end

data/lib/rubber/recipes/rubber/volumes.rb

@@ -25,11 +25,12 @@ namespace :rubber do
       
       created_vols = created_vols.compact.uniq
       raid_specs = env.raid_volumes || []
+      raid_volume_list = raid_specs.collect {|vol| vol["source_devices"]}.join(" ")
       raid_specs.each do |raid_spec|
         # we want to format if we created the ec2 volumes, or if we don't have any
         # ec2 volumes and are just creating raid array from ephemeral stores
-        format = raid_spec['source_devices'].all? {|dev| created_vols.include?(dev)}
-        setup_raid_volume(ic, raid_spec, format)
+        format = raid_spec['source_devices'].all? {|dev| created_vols.include?(dev.gsub("xv","s"))}
+        setup_raid_volume(ic, raid_spec, format, raid_volume_list)
       end
 
       lvm_volume_group_specs = env.lvm_volume_groups || []
@@ -109,11 +110,7 @@ namespace :rubber do
         print "."
         sleep 2
         volume = cloud.describe_volumes(vol_id).first
-        if volume[:attachment_status] == "attached"
-          print "."
-          sleep 2
-          break
-        end
+        break if volume[:attachment_status] == "attached"
       end
       print "\n"
 
@@ -128,7 +125,7 @@ namespace :rubber do
               fi
               mv /etc/fstab /etc/fstab.bak
               cat /etc/fstab.bak | grep -v '#{vol_spec['mount']}' > /etc/fstab
-              if grep '11\.04' /etc/lsb-release; then
+              if [ `lsb_release -r -s | sed 's/[.].*//'` -gt "10" ]; then
 		 device=`echo #{vol_spec['device']} | sed 's/sd/xvd/'`
 	      else
 		 device='#{vol_spec['device']}'
@@ -216,26 +213,34 @@ namespace :rubber do
     end
   end
 
-  def setup_raid_volume(ic, raid_spec, create=false)
+  def setup_raid_volume(ic, raid_spec, create=false, raid_volume_list=nil)
     if create
       mdadm_init = "yes | mdadm --create #{raid_spec['device']} --metadata=1.1 --level #{raid_spec['raid_level']} --raid-devices #{raid_spec['source_devices'].size} #{raid_spec['source_devices'].sort.join(' ')}"
     else
       mdadm_init = "yes | mdadm --assemble #{raid_spec['device']} #{raid_spec['source_devices'].sort.join(' ')}"
     end
-
+    
     task :_setup_raid_volume, :hosts => ic.external_ip do
       rubber.sudo_script 'setup_raid_volume', <<-ENDSCRIPT
         if ! grep -qE '#{raid_spec['device']}|#{raid_spec['mount']}' /etc/fstab; then
           if mount | grep -q '#{raid_spec['mount']}'; then
             umount '#{raid_spec['mount']}'
           fi
-          mv /etc/fstab /etc/fstab.bak
-          cat /etc/fstab.bak | grep -vE '#{raid_spec['device']}|#{raid_spec['mount']}' > /etc/fstab
-          echo '#{raid_spec['device']} #{raid_spec['mount']} #{raid_spec['filesystem']} #{raid_spec['mount_opts'] ? raid_spec['mount_opts'] : 'noatime'} 0 0 # rubber raid volume' >> /etc/fstab
-
-          # seems to help devices initialize, otherwise mdadm fails because
+          
+          # wait for devices to initialize, otherwise mdadm fails because
           # device not ready even though ec2 says the volume is attached
-          fdisk -l &> /dev/null
+          echo 'Waiting for devices'
+          cnt=0
+          while ! [[ -b #{raid_spec['source_devices'] * " && -b "} ]]; do
+            if [[ "$cnt" -eq "15" ]]; then
+              echo 'Timed out waiting for EBS volumes to initialize.'
+              exit 1
+            fi
+            echo '.'
+            sleep 2
+            let "cnt = $cnt + 1"
+          done
+          echo 'Devices ready'
 
           #{mdadm_init}
 
@@ -243,16 +248,23 @@ namespace :rubber do
           echo $((30*1024)) > /proc/sys/dev/raid/speed_limit_min
 
           echo 'MAILADDR #{rubber_env.admin_email}' > /etc/mdadm/mdadm.conf
-          echo 'DEVICE /dev/hd*[0-9] /dev/sd*[0-9]' >> /etc/mdadm/mdadm.conf
-          mdadm --detail --scan >> /etc/mdadm/mdadm.conf
+          echo 'DEVICE #{raid_volume_list}' >> /etc/mdadm/mdadm.conf
+          mdadm --detail --scan | sed s/name=.*\\ // >> /etc/mdadm/mdadm.conf
+          
+          update-initramfs -u
 
           mv /etc/rc.local /etc/rc.local.bak
           echo "mdadm --assemble --scan" > /etc/rc.local
           chmod +x /etc/rc.local
+          
+          mv /etc/fstab /etc/fstab.bak
+          cat /etc/fstab.bak | grep -vE '#{raid_spec['device']}|#{raid_spec['mount']}' > /etc/fstab
+          echo '#{raid_spec['device']} #{raid_spec['mount']} #{raid_spec['filesystem']} #{raid_spec['mount_opts'] ? raid_spec['mount_opts'] : 'noatime'} 0 0 # rubber raid volume' >> /etc/fstab
 
           #{('yes | mkfs -t ' + raid_spec['filesystem'] + ' ' + raid_spec['filesystem_opts'] + ' ' + raid_spec['device']) if create}
           mkdir -p '#{raid_spec['mount']}'
           mount '#{raid_spec['mount']}'
+                 
         fi
       ENDSCRIPT
     end

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 end
 

data/templates/base/config/rubber/rubber-rvm.yml

@@ -8,7 +8,7 @@
 # For IronRuby (if you wish to use it) you will need:
 #   aptitude install curl mono-2.0-devel
 
-packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev, libyaml-dev]
+packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline6-dev, libxml2-dev, libyaml-dev]
 
 # REQUIRED: the version of rvm itself
 rvm_version: 1.10.2

data/templates/base/config/rubber/rubber.yml

@@ -250,14 +250,23 @@ stop_on_error_cmd: "function error_exit { exit 99; }; trap error_exit ERR"
 #
 #     # for raid array, you'll need to add mdadm to packages.  Likewise,
 #     # xfsprogs is needed for xfs filesystem support
+#     #
 #     packages: [xfsprogs, mdadm]
 #     raid_volumes:
 #       - device: /dev/md0 # OS device to to create raid array on
 #         mount: /mnt/fast # The directory to mount this array to
+#         mount_opts: 'nobootwait' # Recent Ubuntu versions require this flag or SSH will not start on reboot
 #         filesystem: xfs # the filesystem to create on array
 #         filesystem_opts: -f # the filesystem opts in mkfs
 #         raid_level: 0 # the raid level to use for the array
-#         source_devices: [/dev/sdx, /dev/sdy] # the source EBS devices we are creating raid array from
+#         # if you're using Ubuntu 11.x or later (Natty, Oneiric, Precise, etc)
+#         # you will want to specify the source devices in their /dev/xvd format
+#         # see https://bugs.launchpad.net/ubuntu/+source/linux/+bug/684875 for
+#         # more information.
+#         # NOTE: Only make this change for raid source_devices, NOT generic
+#         # volume commands above.
+#         source_devices: [/dev/sdx, /dev/sdy] # the source EBS devices we are creating raid array from (Ubuntu Lucid or older)
+#         source_devices: [/dev/xvdx, /dev/xvdy] # the source EBS devices we are creating raid array from (Ubuntu Natty or newer)
 #
 #     # for LVM volumes, you'll need to add lvm2 to packages.  Likewise,
 #     # xfsprogs is needed for xfs filesystem support

data/templates/mysql/config/rubber/role/db/apparmor-mysql.conf

@@ -35,8 +35,8 @@
   /var/lib/mysql/** rwk,
   /var/log/mysql/ r,
   /var/log/mysql/* rw,
-  /var/run/mysqld/mysqld.pid w,
-  /var/run/mysqld/mysqld.sock w,
+  /{,var/}run/mysqld/mysqld.pid w,
+  /{,var/}run/mysqld/mysqld.sock w,
 
   /sys/devices/system/cpu/ r,
   /sys/devices/system/cpu/** r,

data/test/cloud/fog_storage_test.rb

@@ -71,7 +71,7 @@ class FogStorageTest < Test::Unit::TestCase
     
       should "multipart files over 5 mb" do
         @storage.expects(:singlepart_store).never
-        data = 'a' * (5 * 10**6 + 1)
+        data = 'a' * (5 * 2**20 + 1)
     
         #FIXME: Fog mock for initiate_multipart_upload isn't implemented. Remove mocks when it is
         @provider.expects(:initiate_multipart_upload).returns(OpenStruct.new(:body => {'UploadId' => 'fake-upload-id'}))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &11447820 !ruby/object:Gem::Requirement
+  requirement: &22303940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *11447820
+  version_requirements: *22303940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &11451580 !ruby/object:Gem::Requirement
+  requirement: &22301780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11451580
+  version_requirements: *22301780
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &11450820 !ruby/object:Gem::Requirement
+  requirement: &22300360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11450820
+  version_requirements: *22300360
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &11449680 !ruby/object:Gem::Requirement
+  requirement: &22299500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11449680
+  version_requirements: *22299500
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &11447780 !ruby/object:Gem::Requirement
+  requirement: &26492660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11447780
+  version_requirements: *26492660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11446860 !ruby/object:Gem::Requirement
+  requirement: &26492240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11446860
+  version_requirements: *26492240
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &11446300 !ruby/object:Gem::Requirement
+  requirement: &26491780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11446300
+  version_requirements: *26491780
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &11444960 !ruby/object:Gem::Requirement
+  requirement: &26491360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11444960
+  version_requirements: *26491360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &15335180 !ruby/object:Gem::Requirement
+  requirement: &26490940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15335180
+  version_requirements: *26490940
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &15334760 !ruby/object:Gem::Requirement
+  requirement: &26490520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15334760
+  version_requirements: *26490520
 description: ! "    The rubber plugin enables relatively complex multi-instance deployments
   of RubyOnRails applications to\n    Amazon's Elastic Compute Cloud (EC2).  Like
   capistrano, rubber is role based, so you can define a set\n    of configuration
@@ -506,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3761224985838668413
+      hash: 4048110118862946601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: