chef-provisioning-fog 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e73de89aa673ce08cddf04a254af4b1808e4a6a
-  data.tar.gz: 978136a1217ac2b147aa44c9b62497dc7abfec95
+  metadata.gz: fe71d09d45a8426eb7af5b9367aac358cf752124
+  data.tar.gz: 0c454ebeb8827924742c91f1c566c90f6d6f3560
 SHA512:
-  metadata.gz: 57af9e41878abf583365e17f73326a9979c2bab6bf1316d59e1b277a4d4339a54b417730959b701de79f6c3afcc587e40c323b99bfe128dab0f90a6691c4d888
-  data.tar.gz: 1cb02b4c0fef3f645203882a1b59a31267c5618119214f8de9c019deee0a8e8185687ea65dde469a7438ec4462bafc0605bf3fd0fac67e60f1e316d8ad60adb0
+  metadata.gz: 121ff3e73fefe9f6b401727831a46d47b2a7550c07fe0f6ec71915883e7ff7da8626a0989758b674768593149046ecb3a3ba49cb55fffcd112dd2a1d7364b9e8
+  data.tar.gz: 34447372a2c4605cc90b4a476aef6454be76892ccfd88b27a85d93edce61d86e810888d115cadba6425f8cd7706579bad125850e8473af1ebda42b542a0f5aa2

data/lib/chef/provisioning/fog_driver.rb

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

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

@@ -10,7 +10,9 @@ require 'chef/provisioning/convergence_strategy/install_sh'
 require 'chef/provisioning/convergence_strategy/install_cached'
 require 'chef/provisioning/convergence_strategy/no_converge'
 require 'chef/provisioning/transport/ssh'
+require 'chef/provisioning/transport/winrm'
 require 'chef/provisioning/fog_driver/version'
+
 require 'fog'
 require 'fog/core'
 require 'fog/compute'
@@ -258,9 +260,15 @@ module FogDriver
     end
 
     # Not meant to be part of public interface
-    def transport_for(machine_spec, machine_options, server)
-      # TODO winrm
-      create_ssh_transport(machine_spec, machine_options, server)
+    def transport_for(machine_spec, machine_options, server, action_handler = nil)
+      if machine_spec.location['is_windows']
+        action_handler.report_progress "Waiting for admin password on #{machine_spec.name} to be ready (may take up to 15 minutes)..." if action_handler
+        transport = create_winrm_transport(machine_spec, machine_options, server)
+        action_handler.report_progress 'Admin password available ...' if action_handler
+        transport
+      else
+        create_ssh_transport(machine_spec, machine_options, server)
+      end
     end
 
     protected
@@ -400,7 +408,8 @@ module FogDriver
     end
 
     def wait_for_transport(action_handler, machine_spec, machine_options, server)
-      transport = transport_for(machine_spec, machine_options, server)
+
+      transport = transport_for(machine_spec, machine_options, server, action_handler)
       if !transport.available?
         if action_handler.should_perform_actions
           action_handler.report_progress "waiting for #{machine_spec.name} (#{server.id} on #{driver_url}) to be connectable (transport up and running) ..."
@@ -560,37 +569,43 @@ module FogDriver
       end
     end
 
-    def ssh_options_for(machine_spec, machine_options, server)
-      result = {
-# TODO create a user known hosts file
-#          :user_known_hosts_file => vagrant_ssh_config['UserKnownHostsFile'],
-#          :paranoid => true,
-        :auth_methods => [ 'publickey' ],
-        :keys_only => true,
-        :host_key_alias => "#{server.id}.#{provider}"
-      }.merge(machine_options[:ssh_options] || {})
+    # 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 [Chef::Provisioning::Machine] server a Machine representing the server
+    # @return [String] PEM-encoded private key
+    def private_key_for(machine_spec, server)
       if server.respond_to?(:private_key) && server.private_key
-        result[:key_data] = [ server.private_key ]
+         server.private_key
       elsif server.respond_to?(:key_name) && server.key_name
         key = get_private_key(server.key_name)
         if !key
           raise "Server has key name '#{server.key_name}', but the corresponding private key was not found locally.  Check if the key is in Chef::Config.private_key_paths: #{Chef::Config.private_key_paths.join(', ')}"
         end
-        result[:key_data] = [ key ]
+        key
       elsif machine_spec.location['key_name']
         key = get_private_key(machine_spec.location['key_name'])
         if !key
           raise "Server was created with key name '#{machine_spec.location['key_name']}', but the corresponding private key was not found locally.  Check if the key is in Chef::Config.private_key_paths: #{Chef::Config.private_key_paths.join(', ')}"
         end
-        result[:key_data] = [ key ]
+        key
       elsif machine_options[:bootstrap_options][:key_path]
-        result[:key_data] = [ IO.read(machine_options[:bootstrap_options][:key_path]) ]
+        IO.read(machine_options[:bootstrap_options][:key_path])
       elsif machine_options[:bootstrap_options][:key_name]
-        result[:key_data] = [ get_private_key(machine_options[:bootstrap_options][:key_name]) ]
+        get_private_key(machine_options[:bootstrap_options][:key_name])
       else
         # TODO make a way to suggest other keys to try ...
         raise "No key found to connect to #{machine_spec.name} (#{machine_spec.location.inspect})!"
       end
+    end
+
+    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) ]
       result
     end
 
@@ -598,6 +613,10 @@ module FogDriver
       'root'
     end
 
+    def create_winrm_transport(machine_spec, machine_options, server)
+      fail "This provider doesn't know how to do that."
+    end
+
     def create_ssh_transport(machine_spec, machine_options, server)
       ssh_options = ssh_options_for(machine_spec, machine_options, server)
       username = machine_spec.location['ssh_username'] || default_ssh_username

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

@@ -1,6 +1,10 @@
 require 'chef/log'
 require 'fog/aws'
 require 'uri'
+require 'base64'
+require 'openssl'
+require 'pathname'
+require 'chef/provisioning/transport/winrm'
 
 #   fog:AWS:<account_id>:<region>
 #   fog:AWS:<profile_name>
@@ -23,6 +27,45 @@ module FogDriver
         'ubuntu'
       end
 
+      # Create a WinRM transport for an AWS instance
+      # @param [Hash] machine_spec Machine-spec hash
+      # @param [Hash] machine_options Machine options (from the recipe)
+      # @param [Fog::Compute::Server] server A Fog mapping to the AWS instance
+      # @return [ChefMetal::Transport::WinRM] A WinRM Transport object to talk to the server
+      def create_winrm_transport(machine_spec, machine_options, server)
+        remote_host = if machine_spec.location['use_private_ip_for_ssh']
+                        server.private_ip_address
+                      elsif !server.public_ip_address
+                        Chef::Log.warn("Server #{machine_spec.name} has no public ip address.  Using private ip '#{server.private_ip_address}'.  Set driver option 'use_private_ip_for_ssh' => true if this will always be the case ...")
+                        server.private_ip_address
+                      elsif server.public_ip_address
+                        server.public_ip_address
+                      else
+                        fail "Server #{server.id} has no private or public IP address!"
+                      end
+
+        port = machine_spec.location['winrm_port'] || 5985
+        endpoint = "http://#{remote_host}:#{port}/wsman"
+        type = :plaintext
+        pem_bytes = private_key_for(machine_spec, server)
+        encrypted_admin_password = wait_for_admin_password(machine_spec)
+        decoded = Base64.decode64(encrypted_admin_password)
+        private_key = OpenSSL::PKey::RSA.new(pem_bytes)
+        decrypted_password = private_key.private_decrypt decoded
+
+        # Use basic HTTP auth - this is required for the WinRM setup we
+        # are using
+        # TODO: Improve that.
+        options = {
+            :user => machine_spec.location['winrm.username'] || 'Administrator',
+            :pass => decrypted_password,
+            :disable_sspi => true,
+            :basic_auth_only => true
+        }
+
+        Chef::Provisioning::Transport::WinRM.new(endpoint, type, options, {})
+      end
+
       def allocate_image(action_handler, image_spec, image_options, machine_spec)
         if image_spec.location
           image = compute.images.get(image_spec.location['image_id'])
@@ -87,6 +130,12 @@ module FogDriver
         if !bootstrap_options[:key_name]
           bootstrap_options[:key_name] = overwrite_default_key_willy_nilly(action_handler, machine_spec)
         end
+
+        if machine_options[:is_windows]
+          Chef::Log.debug('Attaching WinRM data for user data.')
+          # Enable WinRM basic auth, HTTP and open the firewall
+          bootstrap_options[:user_data] = user_data
+        end
         bootstrap_options.delete(:tags) # we handle these separately for performance reasons
         bootstrap_options
       end
@@ -351,6 +400,27 @@ module FogDriver
       end
 
       private
+      def user_data
+        # TODO: Make this use HTTPS at some point.
+        <<EOD
+<powershell>
+winrm quickconfig -q
+winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="300"}'
+winrm set winrm/config '@{MaxTimeoutms="1800000"}'
+winrm set winrm/config/service '@{AllowUnencrypted="true"}'
+winrm set winrm/config/service/auth '@{Basic="true"}'
+
+netsh advfirewall firewall add rule name="WinRM 5985" protocol=TCP dir=in localport=5985 action=allow
+netsh advfirewall firewall add rule name="WinRM 5986" protocol=TCP dir=in localport=5986 action=allow
+
+net stop winrm
+sc config winrm start=auto
+net start winrm
+</powershell>
+
+EOD
+      end
+
       def self.default_ami_for_region(region)
         Chef::Log.debug("Choosing default AMI for region '#{region}'")
 
@@ -374,6 +444,33 @@ module FogDriver
         end
       end
 
+      # Wait for the Windows Admin password to become available
+      # @param [Hash] machine_spec Machine spec data
+      # @return [String] encrypted admin password
+      def wait_for_admin_password(machine_spec)
+        time_elapsed = 0
+        sleep_time = 10
+        max_wait_time = 900 # 15 minutes
+        encrypted_admin_password = nil
+        instance_id = machine_spec.location['server_id']
+
+
+        Chef::Log.info "waiting for #{machine_spec.name}'s admin password to be available..."
+        while time_elapsed < max_wait_time && encrypted_admin_password.nil?
+          response = compute.get_password_data(instance_id)
+          encrypted_admin_password = response.body['passwordData']
+          if encrypted_admin_password.nil?
+            Chef::Log.info "#{time_elapsed}/#{max_wait_time}s elapsed -- sleeping #{sleep_time} seconds for #{machine_spec.name}'s admin password."
+            sleep(sleep_time)
+            time_elapsed += sleep_time
+          end
+        end
+
+        Chef::Log.info "#{machine_spec.name}'s admin password is available!'"
+
+        encrypted_admin_password
+      end
+
     end
   end
 end

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

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

data/lib/chef/resource/fog_key_pair.rb

@@ -28,7 +28,7 @@ class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
   end
 
   # We are not interested in Chef's cloning behavior here.
-  def load_prior_resource
+  def load_prior_resource(*args)
     Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -107,6 +107,7 @@ 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