aws.rb in cloud-mu-2.0.0.pre.alpha9

- old
+ new

@@ -144,13 +144,12 @@
 
       # If we've configured AWS as a provider, or are simply hosted in AWS, 
       # decide what our default region is.
       def self.myRegion
         return @@myRegion_var if @@myRegion_var
-        return nil if credConfig.nil? and !hosted?
 
-        if $MU_CFG and (!$MU_CFG['aws'] or !account_number) and !hosted? and !ENV['EC2_REGION']
+        if credConfig.nil? and !hosted? and !ENV['EC2_REGION']
           return nil
         end
 
         def self.validate_region(r)
           MU::Cloud::AWS.ec2(region: r).describe_availability_zones.availability_zones.first.region_name
@@ -437,14 +436,15 @@
                 @@my_hosted_cfg = hosted_config
                 return name_only ? "#default" : @@my_hosted_cfg
               end
             rescue JSON::ParserError => e
             end
-          elsif ENV['AWS_ACCESS_KEY'] and ENV['AWS_SECRET_ACCESS_KEY']
+          elsif ENV['AWS_ACCESS_KEY_ID'] and ENV['AWS_SECRET_ACCESS_KEY']
             env_config = {
               "region" => ENV['EC2_REGION'] || "us-east-1",
-              "access_key" => ENV['AWS_ACCESS_KEY'],
-              "access_secret" => ENV['AWS_SECRET_ACCESS_KEY']
+              "access_key" => ENV['AWS_ACCESS_KEY_ID'],
+              "access_secret" => ENV['AWS_SECRET_ACCESS_KEY'],
+              "log_bucket_name" => "mu-placeholder-bucket-name"
             }
             return name_only ? "#default" : env_config
           end
 
           return nil