chef-provisioning-aws 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f9c82b6a8923c933077a7055cc31c083291527
-  data.tar.gz: 886d034e57402dacb17d143c1e18e9bb94129a99
+  metadata.gz: a417bfb510b60aceeac847e46aae75bb45e95f2e
+  data.tar.gz: 553832588205c18911e9093b6377f65d8c5736f9
 SHA512:
-  metadata.gz: 21596d7e34ff111450d05400eb681844bf8321a1721d409020c5ab7227591f333ff9eb9799b8f4b98526a888a75b5ba066e66026226787c0546477aa7873d65f
-  data.tar.gz: d32aa0894bb97de809bc3bea3ba855c1820cb2aca2208e3a1276b1c00d83ce90ad689cc05b4be90706b3f49c2788e015834c455e7c8ad2bd5d85d8a73deea0b9
+  metadata.gz: 959abe2a3e9b4907bf5dedbc4ef91251dd76db537045564add148c099a954e50307d723c71f845f508a3803ad3cdee41f3f91a393d4ad4dc4cace0fd4e7aa8d9
+  data.tar.gz: cdf01038f21b40cd6e728dcec4dc6182774b9e8c706c4d35c8d5e12dda89a0d66cf248ebc93cee6298181e4dff89c51d5ceb95f9b3cfae20b0983eab07625147

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

@@ -15,6 +15,7 @@ require 'chef/provisioning/aws_driver/credentials'
 
 require 'yaml'
 require 'aws-sdk-v1'
+
 # loads the entire aws-sdk
 AWS.eager_autoload!
 
@@ -58,17 +59,20 @@ module AWSDriver
 
     # Load balancer methods
     def allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
-      security_group_name = lb_options[:security_group_name] || 'default'
-      security_group_id = lb_options[:security_group_id]
-
-      security_group = if security_group_id.nil?
-                         ec2.security_groups.filter('group-name', security_group_name).first
-                       else
-                         ec2.security_groups[security_group_id]
-                       end
+      if lb_options[:security_group_id]
+        security_group = ec2.security_groups[:security_group_id]
+      elsif lb_options[:security_group_name]
+        security_group = ec2.security_groups.filter('group-name', lb_options[:security_group_name])
+      end
+
       availability_zones = lb_options[:availability_zones]
       listeners = lb_options[:listeners]
 
+      lb_optionals = {}
+      lb_optionals[:security_groups] = [security_group] if security_group
+      lb_optionals[:availability_zones] = availability_zones if availability_zones
+      lb_optionals[:listeners] = listeners if listeners
+
       actual_elb = load_balancer_for(lb_spec)
       if !actual_elb.exists?
         perform_action = proc { |desc, &block| action_handler.perform_action(desc, &block) }
@@ -79,10 +83,7 @@ module AWSDriver
         updates << "  with security group #{security_group.name}" if security_group
 
         action_handler.perform_action updates do
-          actual_elb = elb.load_balancers.create(lb_spec.name,
-            availability_zones: availability_zones,
-            listeners:          listeners,
-            security_groups:    [security_group])
+          actual_elb = elb.load_balancers.create(lb_spec.name, lb_optionals)
 
           lb_spec.location = {
             'driver_url' => driver_url,
@@ -322,9 +323,9 @@ module AWSDriver
           end
         end
         wait_until_ready_machine(action_handler, machine_spec, instance)
-        wait_for_transport(action_handler, machine_spec, machine_options)
       end
 
+      wait_for_transport(action_handler, machine_spec, machine_options)
       machine_for(machine_spec, machine_options, instance)
     end
 
@@ -530,12 +531,12 @@ module AWSDriver
 
     def ssh_options_for(machine_spec, machine_options, instance)
       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 => "#{instance.id}.AWS"
+        # 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 => "#{instance.id}.AWS"
       }.merge(machine_options[:ssh_options] || {})
       if instance.respond_to?(:private_key) && instance.private_key
         result[:key_data] = [ instance.private_key ]

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef