Merge pull request sous-chefs#160 from ubiquitousthey/region_from_att…

…ribute Use attribute for region if not in ec2
CheggEng · Nov 25, 2015 · 7c68788 · 7c68788
2 parents 065c9a6 + 02c14e8
commit 7c68788
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -20,3 +20,4 @@
 default['aws']['aws_sdk_version'] = '~> 2.2.3'
 default['aws']['databag_name'] = nil
 default['aws']['databag_entry'] = nil
+default['aws']['region'] = nil
diff --git a/libraries/ec2.rb b/libraries/ec2.rb
@@ -62,8 +62,16 @@ def create_aws_interface(aws_interface)
           Chef::Log.error("Missing gem 'aws-sdk'. Use the default aws recipe to install it first.")
         end
 
-        region = instance_availability_zone
-        region = region[0, region.length - 1]
+        region = node['aws']['region']
+
+        if region.nil?
+          if node.attribute?('ec2')
+            region = instance_availability_zone
+            region = region[0, region.length - 1]
+          else
+            region = 'us-east-1'
+          end
+        end
 
         if !new_resource.aws_access_key.to_s.empty? && !new_resource.aws_secret_access_key.to_s.empty?
           creds = ::Aws::Credentials.new(new_resource.aws_access_key, new_resource.aws_secret_access_key, new_resource.aws_session_token)