chef-provisioning-aws 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f0514d962d5789033fb18a43ef72ee0e837a01
-  data.tar.gz: 7e9a266dc9dad08d2cc96c43723e9e3e3d5c952b
+  metadata.gz: 3acb67df3a046b0298b40a390a7cacee7e700b51
+  data.tar.gz: 0e7d8231c5a682d1b25c6c8ca138abbec7422494
 SHA512:
-  metadata.gz: 868772f85f647b4cd65db9e6c1d150b232b32544923d3a3116c1fddd957c392f48d66a0a6e74e5f55da30241b345a89e68f10ecb2b59cb3a6d84bd2933d6cf15
-  data.tar.gz: 88d0e115dc23de3a093dd5dafebae2f450237b2b591c1bb1feab84992eb86aad7480622c08eb044e1eb8c4996d0d295b5367572a38ef757f34c983c510ac879c
+  metadata.gz: dca5eec228b058b87d02c7da2098806073c904e1369672f724a2dfd4ad5115b248241defe1aa5a8dd9c5b1d1b18340fbdabe9e4c66bff7a3f9099e8eae8e4729
+  data.tar.gz: 821c4ba12a4dedba7cdd7da366f277e2c32ab14215a9de36d30078dc9c1ea1eb9c3bb9619bec6aad11b27922fdf6d94566d89747dd55a1cc0347cb07257c488e

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

@@ -60,11 +60,22 @@ module AWSDriver
             'host_node' => action_handler.host_node,
         }
 
+        security_group_name = lb_options[:security_group_name] || 'default'
+        security_group_id = lb_options[:security_group_id]
+
+        default_sg = ec2.security_groups.filter('group-name', 'default')
+        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
+
         availability_zones = lb_options[:availability_zones]
         listeners = lb_options[:listeners]
         elb.load_balancers.create(lb_spec.name,
                 :availability_zones => availability_zones,
-                :listeners => listeners)
+                :listeners => listeners,
+                :security_groups => [security_group])
       end
     end
 
@@ -74,32 +85,44 @@ module AWSDriver
     def destroy_load_balancer(action_handler, lb_spec, lb_options)
     end
 
+    # TODO update listeners and zones, and other bits
     def update_load_balancer(action_handler, lb_spec, lb_options, opts = {})
       existing_elb = load_balancer_for(lb_spec)
-      # TODO update listeners and zones?
-      if existing_elb.exists?
-        machines = opts[:machines]
-        existing_instance_ids = existing_elb.instances.collect { |i| i.instance_id }
-        new_instance_ids = machines.keys.collect do |machine_name|
-          machine_spec = machines[machine_name]
-          machine_spec.location['instance_id']
-        end
 
-        instance_ids_to_add = new_instance_ids - existing_instance_ids
-        instance_ids_to_remove = existing_instance_ids - new_instance_ids
+      # Try to recreate it if it doesn't exist in AWS
+      action_handler.report_progress "Checking for ELB named #{lb_spec.name}..."
+      allocate_load_balancer(action_handler, lb_spec, lb_options) unless existing_elb.exists?
+
+      # Try to find it again -- if we can't, consider it fatal
+      existing_elb = load_balancer_for(lb_spec)
+      fail "Unable to find specified ELB instance. Already tried to recreate it!" if !existing_elb.exists?
+
+      action_handler.report_progress "Updating ELB named #{lb_spec.name}..."
+
+      machines = opts[:machines]
+      existing_instance_ids = existing_elb.instances.collect { |i| i.instance_id }
 
-        if instance_ids_to_add && instance_ids_to_add.size > 0
+      new_instance_ids = machines.keys.collect do |machine_name|
+        machine_spec = machines[machine_name]
+        machine_spec.location['instance_id']
+      end
+
+      instance_ids_to_add = new_instance_ids - existing_instance_ids
+      instance_ids_to_remove = existing_instance_ids - new_instance_ids
+
+      if instance_ids_to_add && instance_ids_to_add.size > 0
+        action_handler.perform_action "Adding instances: #{instance_ids_to_add}" do
           existing_elb.instances.add(instance_ids_to_add)
         end
+      end
 
-        if instance_ids_to_remove && instance_ids_to_remove.size > 0
+      if instance_ids_to_remove && instance_ids_to_remove.size > 0
+        action_handler.perform_action "Removing instances: #{instance_ids_to_remove}" do
           existing_elb.instances.remove(instance_ids_to_remove)
         end
-
       end
     end
 
-
     # Image methods
     def allocate_image(action_handler, image_spec, image_options, machine_spec)
     end

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '0.1'
+  VERSION = '0.1.1'
 end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - John Ewart