chef-metal-fog 0.5.beta.5 → 0.5.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d322a0449ade9efef2687f008518e7ac83d1e7d
-  data.tar.gz: 7bd6f1bb30ac76cd48fda57143345225db5de2ad
+  metadata.gz: 808835083ceaf7db0de62541e834b4730d8ea919
+  data.tar.gz: d3333babf02cf215c515e78c8167fe9df22b0570
 SHA512:
-  metadata.gz: 7de8f96cd3532800eb4b8f75624c689586d6c9dbbfceef3ba7491974d70fb854478ff3849e4a76fe8323d9700152ec6674e17eefe49a265684baf06cc0667d48
-  data.tar.gz: df850e30c2f46a531d3b735c5aecdc8b9a3b2ce79245d321544dc0e290cbb9f551fc5a9603367669fd5f8f2d764f4b1c1253810ab1e07fde1424e95930a34640
+  metadata.gz: 54d7c00be7001d256832652f8d78865ed2a7eb43fc6e3a273c255aa24dd37d53e020a301067e9fd079d55528a27ca8b967a10b333ef67fe3fe1846523045f3bd
+  data.tar.gz: c5338a27a82b1d1f750feae7cb72214e064b65cce937b6b69afff0183b3d560f28dbe3567160d90b886a0f61069df683cf12808c1dc0ee2cf6941a531ac3393d

data/lib/chef_metal_fog/fog_driver.rb

@@ -28,6 +28,7 @@ module ChefMetalFog
   #
   #   fog:AWS:<account_id>:<region>
   #   fog:AWS:<profile_name>
+  #   fog:AWS:<profile_name>:<region>
   #   fog:OpenStack:https://identityHost:portNumber/v2.0
   #   fog:DigitalOcean:<client id>
   #   fog:Rackspace:https://identity.api.rackspacecloud.com/v2.0
@@ -546,7 +547,7 @@ module ChefMetalFog
       new_compute_options = {}
       new_compute_options[:provider] = provider
       new_config = { :driver_options => { :compute_options => new_compute_options }}
-      config = Cheffish::MergedConfig.new(new_config, config)
+      result = Cheffish::MergedConfig.new(new_config, config)
 
       # Get data from the identifier in the URL
       if id && id != ''
@@ -556,13 +557,15 @@ module ChefMetalFog
           if id =~ /^(\d{12})(:(.+))?$/
             if $2
               id = $1
-              driver_options[:region] = $3
+              new_compute_options[:region] = $3
             else
               Chef::Log.warn("Old-style AWS URL #{id} from an early beta of chef-metal (before 0.11-final) found. If you have servers in multiple regions on this account, you may see odd behavior like servers being recreated. To fix, edit any nodes with attribute metal.location.driver_url to include the region like so: fog:AWS:#{id}:<region> (e.g. us-east-1)")
             end
           else
             # Assume it is a profile name, and set that.
-            driver_options[:aws_profile] = id
+            aws_profile, region = id.split(':', 2)
+            new_config[:driver_options][:aws_profile] = aws_profile
+            new_compute_options[:region] = region
             id = nil
           end
         when 'DigitalOcean'
@@ -586,10 +589,12 @@ module ChefMetalFog
       case provider
       when 'AWS'
         # Grab the profile
-        aws_profile = FogDriverAWS.get_aws_profile(driver_options, id)
-        [ :aws_access_key_id, :aws_secret_access_key, :aws_security_token, :region].each do |key|
-          new_compute_options[key] = aws_profile[key] if aws_profile.has_key?(key)
+        aws_profile = FogDriverAWS.get_aws_profile(result[:driver_options], id)
+        [ :aws_access_key_id, :aws_secret_access_key, :aws_security_token].each do |key|
+          new_compute_options[key] = aws_profile[key]
         end
+        # For :region, we prefer the region in compute options or URL over the region in the profile.
+        new_compute_options[:region] ||= aws_profile[:region] if aws_profile.has_key?(:region) && !compute_options.has_key?(:region)
       when 'OpenStack'
         # TODO it is supposed to be unnecessary to load credentials from fog this way;
         # why are we doing it?
@@ -613,9 +618,9 @@ module ChefMetalFog
 
       id = case provider
         when 'AWS'
-          account_info = FogDriverAWS.aws_account_info_for(config[:driver_options][:compute_options])
+          account_info = FogDriverAWS.aws_account_info_for(result[:driver_options][:compute_options])
           new_config[:driver_options][:aws_account_info] = account_info
-          "#{account_info[:aws_account_id]}:#{config[:driver_options][:compute_options][:region]}"
+          "#{account_info[:aws_account_id]}:#{result[:driver_options][:compute_options][:region]}"
         when 'DigitalOcean'
           config[:driver_options][:compute_options][:digitalocean_client_id]
         when 'OpenStack'
@@ -623,15 +628,15 @@ module ChefMetalFog
         when 'Rackspace'
           config[:driver_options][:compute_options][:rackspace_auth_url]
         when 'CloudStack'
-          host   = config[:driver_options][:compute_options][:cloudstack_host]
-          path   = config[:driver_options][:compute_options][:cloudstack_path]    || '/client/api'
-          port   = config[:driver_options][:compute_options][:cloudstack_port]    || 443
-          scheme = config[:driver_options][:compute_options][:cloudstack_scheme]  || 'https'
+          host   = result[:driver_options][:compute_options][:cloudstack_host]
+          path   = result[:driver_options][:compute_options][:cloudstack_path]    || '/client/api'
+          port   = result[:driver_options][:compute_options][:cloudstack_port]    || 443
+          scheme = result[:driver_options][:compute_options][:cloudstack_scheme]  || 'https'
 
           URI.scheme_list[scheme.upcase].build(:host => host, :port => port, :path => path).to_s
         end
 
-      [ config, id ]
+      [ result, id ]
     end
   end
 end

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.beta.5'
+  VERSION = '0.5.beta.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.beta.5
+  version: 0.5.beta.6
 platform: ruby
 authors:
 - John Keiser