chef-provisioning-fog 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe71d09d45a8426eb7af5b9367aac358cf752124
-  data.tar.gz: 0c454ebeb8827924742c91f1c566c90f6d6f3560
+  metadata.gz: 34990906985f7a7c4de47ef2a7e670a309412324
+  data.tar.gz: ad07082eaa71fc18afdc44b5fbd22819ffc75998
 SHA512:
-  metadata.gz: 121ff3e73fefe9f6b401727831a46d47b2a7550c07fe0f6ec71915883e7ff7da8626a0989758b674768593149046ecb3a3ba49cb55fffcd112dd2a1d7364b9e8
-  data.tar.gz: 34447372a2c4605cc90b4a476aef6454be76892ccfd88b27a85d93edce61d86e810888d115cadba6425f8cd7706579bad125850e8473af1ebda42b542a0f5aa2
+  metadata.gz: 62236621c239d507ed1393e3a6780ca72966e7f27a46d4954ea5ca4da066dc18b826c5a2cf7f3fe4b251decec583e9212774a0614228abd62a4e6f379c400eec
+  data.tar.gz: 1b7e1878546996f6d05790f3efbf5d0b855aa88db4a77553ef08c039a31c3f36979eedca140311d78a7f826339b31502ea2fef266b7902f40a3d48d8feb4579e

data/lib/chef/provisioning/fog_driver/driver.rb

@@ -316,7 +316,6 @@ module FogDriver
         description = [ "creating #{machine_description} on #{driver_url}" ]
         bootstrap_options.each_pair { |key,value| description << "  #{key}: #{value.inspect}" }
         action_handler.report_progress description
-
         if action_handler.should_perform_actions
           # Actually create the servers
           create_many_servers(machine_specs.size, bootstrap_options, parallelizer) do |server|
@@ -341,7 +340,7 @@ module FogDriver
           end
 
           if machine_specs.size > 0
-            raise "Not all machines were created by create_many_machines!"
+            raise "Not all machines were created by create_many_servers!"
           end
         end
       end.to_a
@@ -349,7 +348,8 @@ module FogDriver
 
     def create_many_servers(num_servers, bootstrap_options, parallelizer)
       parallelizer.parallelize(1.upto(num_servers)) do |i|
-        server = compute.servers.create(bootstrap_options)
+        clean_bootstrap_options = Marshal.load(Marshal.dump(bootstrap_options)) # Prevent destructive operations on bootstrap_options.
+        server = compute.servers.create(clean_bootstrap_options)
         yield server if block_given?
         server
       end.to_a
@@ -572,9 +572,10 @@ module FogDriver
     # Get the private key for a machine - prioritize the server data, fall back to the
     # the machine spec data, and if that doesn't work, raise an exception.
     # @param [Hash] machine_spec Machine spec data
+    # @param [Hash] machine_options Machine options
     # @param [Chef::Provisioning::Machine] server a Machine representing the server
     # @return [String] PEM-encoded private key
-    def private_key_for(machine_spec, server)
+    def private_key_for(machine_spec, machine_options, server)
       if server.respond_to?(:private_key) && server.private_key
          server.private_key
       elsif server.respond_to?(:key_name) && server.key_name
@@ -602,10 +603,13 @@ module FogDriver
     def ssh_options_for(machine_spec, machine_options, server)
       result = {
         :auth_methods => [ 'publickey' ],
-        :keys_only => true,
         :host_key_alias => "#{server.id}.#{provider}"
       }.merge(machine_options[:ssh_options] || {})
-      result[:key_data] = [ private_key_for(machine_spec, server) ]
+      # Grab key_data from the user's config if not specified
+      unless result.has_key?(:key_data)
+        result[:keys_only] = true
+        result[:key_data] = [ private_key_for(machine_spec, machine_options, server) ]
+      end
       result
     end
 

data/lib/chef/provisioning/fog_driver/providers/aws.rb

@@ -47,7 +47,7 @@ module FogDriver
         port = machine_spec.location['winrm_port'] || 5985
         endpoint = "http://#{remote_host}:#{port}/wsman"
         type = :plaintext
-        pem_bytes = private_key_for(machine_spec, server)
+        pem_bytes = private_key_for(machine_spec, machine_options, server)
         encrypted_admin_password = wait_for_admin_password(machine_spec)
         decoded = Base64.decode64(encrypted_admin_password)
         private_key = OpenSSL::PKey::RSA.new(pem_bytes)
@@ -335,7 +335,7 @@ module FogDriver
 
         if id && id != ''
           # AWS canonical URLs are of the form fog:AWS:
-          if id =~ /^(\d{12})(:(.+))?$/
+          if id =~ /^(\d{12}|IAM)(:(.+))?$/
             if $2
               id = $1
               new_compute_options[:region] = $3
@@ -350,17 +350,22 @@ module FogDriver
             id = nil
           end
         end
-
-        aws_profile = get_aws_profile(result[:driver_options], id)
-        new_compute_options[:aws_access_key_id] = aws_profile[:aws_access_key_id]
-        new_compute_options[:aws_secret_access_key] = aws_profile[:aws_secret_access_key]
-        new_compute_options[:aws_session_token] = aws_profile[:aws_security_token]
-        new_defaults[:driver_options][:compute_options][:region] = aws_profile[:region]
-        new_defaults[:driver_options][:compute_options][:endpoint] = aws_profile[:ec2_endpoint]
-
-        account_info = aws_account_info_for(result[:driver_options][:compute_options])
-        new_config[:driver_options][:aws_account_info] = account_info
-        id = "#{account_info[:aws_account_id]}:#{result[:driver_options][:compute_options][:region]}"
+        if id == 'IAM'
+          id = "IAM:#{result[:driver_options][:compute_options][:region]}"
+          new_config[:driver_options][:aws_account_info] = { aws_username: 'IAM' }
+          new_compute_options[:use_iam_profile] = true
+        else
+          aws_profile = get_aws_profile(result[:driver_options], id)
+          new_compute_options[:aws_access_key_id] = aws_profile[:aws_access_key_id]
+          new_compute_options[:aws_secret_access_key] = aws_profile[:aws_secret_access_key]
+          new_compute_options[:aws_session_token] = aws_profile[:aws_security_token]
+          new_defaults[:driver_options][:compute_options][:region] = aws_profile[:region]
+          new_defaults[:driver_options][:compute_options][:endpoint] = aws_profile[:ec2_endpoint]
+
+          account_info = aws_account_info_for(result[:driver_options][:compute_options])
+          new_config[:driver_options][:aws_account_info] = account_info
+          id = "#{account_info[:aws_account_id]}:#{result[:driver_options][:compute_options][:region]}"
+        end
 
         # Make sure we're using a reasonable default AMI, for now this is Ubuntu 14.04 LTS
         result[:machine_options][:bootstrap_options][:image_id] ||=

data/lib/chef/provisioning/fog_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module FogDriver
-  VERSION = '0.11'
+  VERSION = '0.12'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -107,7 +107,6 @@ files:
 - Rakefile
 - lib/chef/provider/fog_key_pair.rb
 - lib/chef/provisioning/driver_init/fog.rb
-- lib/chef/provisioning/fog_driver.rb
 - lib/chef/provisioning/fog_driver/driver.rb
 - lib/chef/provisioning/fog_driver/providers/aws.rb
 - lib/chef/provisioning/fog_driver/providers/aws/credentials.rb

data/lib/chef/provisioning/fog_driver.rb

@@ -1 +0,0 @@
-require 'chef/provisioning/fog_driver/driver'