using node[:backups][:region] config, chef solo "cannot configure" wa…

…rning same as chef server

chef/cookbooks/mongodb/definitions/mongodb.rb

@@ -250,6 +250,7 @@
         action     [:auto_attach]
         snapshots  MongoDB.find_snapshots(aws["aws_access_key_id"],
                                           aws["aws_secret_access_key"],
+                                          node[:backups][:region],
                                           node[:backups][:mongo_volumes],
                                           node[:mongodb][:cluster_name])
   end

chef/cookbooks/mongodb/libraries/ec2.rb

@@ -7,7 +7,7 @@ class Chef::ResourceDefinitionList::MongoDB
   # nil.  The returned snapshots array will be parallel to the volumes array,
   # i.e the latest snapshot for the Nth volume in the array will be the Nth
   # snapshot in the result.
-  def self.find_snapshots(key, secret_key, volumes, clustername)
+  def self.find_snapshots(key, secret_key, region, volumes, clustername)
     require 'aws-sdk'
 
     if volumes.size == 0
@@ -18,7 +18,7 @@ def self.find_snapshots(key, secret_key, volumes, clustername)
     # Compute the latest snapshots.
     ec2 = AWS::EC2.new(
           :access_key_id => key,
-          :secret_access_key => secret_key)
+          :secret_access_key => secret_key).regions[region]
 
     # This is an array of arrays.  snapshots[i] will have the sorted list of
     # snapshots for volumes[i].  The snapshots are sorted by description which

chef/cookbooks/mongodb/libraries/mongodb.rb

@@ -29,12 +29,8 @@ def self.configure_replicaset(node, name, members)
     require 'mongo'
 
     if members.length == 0
-      if Chef::Config[:solo]
-        abort("Cannot configure replicaset '#{name}', no member nodes found")
-      else
-        Chef::Log.warn("Cannot configure replicaset '#{name}', no member nodes found")
-        return
-      end
+			Chef::Log.warn("Cannot configure replicaset '#{name}', no member nodes found")
+			return
     end
 
     begin

chef/cookbooks/mongodb/templates/default/raid_snapshot.sh.erb

@@ -21,5 +21,5 @@ else
   string="Mongo RAID Snapshot $(date +%F:%T)"
 fi
 
-/usr/local/bin/mongo-ec2-raid-snapshot --quiet --region us-east-1 --description "$string" <%= node['backups']['mongo_volumes'].join(" ") %>
+/usr/local/bin/mongo-ec2-raid-snapshot --quiet --region <%= node['backups']['region'] %> --description "$string" <%= node['backups']['mongo_volumes'].join(" ") %>