amazon-instance 0.0.2 → 0.1.0

data/config/general.yml

@@ -1,3 +1,4 @@
 access_key_id: YOUR_ACCESS_KEY
 secret_key_id: YOUR_SECRET_KEY
-ec2_zone_url:  https://eu-west-1.ec2.amazonaws.com
+ec2_zone_url:  https://eu-west-1.ec2.amazonaws.com
+elb_zone_url:  http://elasticloadbalancing.eu-west-1.amazonaws.com

data/lib/amazon-instance.rb

@@ -23,7 +23,8 @@ class AmazonInstance
   def launch(ec2=nil)
     ec2 = AmazonEC2.new(@config['access_key_id'],
                         @config['secret_key_id'],
-                        URI.parse(@config['ec2_zone_url']).host) if ec2.nil?
+                        URI.parse(@config['ec2_zone_url']).host,
+                        URI.parse(@config['elb_zone_url']).host) if ec2.nil?
 
     group = @project[:security_group]
     

data/lib/amazon-instance/amazon-ec2.rb

@@ -3,10 +3,13 @@ require 'socket'
 require 'timeout'
 
 class AmazonEC2
-  def initialize(access_key, secret_key, server)
+  def initialize(access_key, secret_key, ec2_server, elb_server)
     @ec2 = AWS::EC2::Base.new(:access_key_id     => access_key,
                               :secret_access_key => secret_key,
-                              :server            => server)
+                              :server            => ec2_server)
+    @elb = AWS::ELB::Base.new(:access_key_id     => access_key,
+                              :secret_access_key => secret_key,
+                              :server            => elb_server)
   end
   
   def launch_instance(environment, config, config_dir) 
@@ -20,9 +23,13 @@ class AmazonEC2
 
     instance = @ec2.run_instances(config.to_hash)
     
-    instanceId = instance['instancesSet']['item'].first['instanceId']
+    instance_id = instance['instancesSet']['item'].first['instanceId']
+
+    if config[:load_balancer]
+      attach_instance_to_load_balancer(instance_id, config[:load_balancer])
+    end
 
-    host_by_instance(instanceId)
+    host_by_instance(instance_id)
   end
   
   def valid_group?(group_name)
@@ -47,6 +54,11 @@ class AmazonEC2
     host
   end
   
+  def attach_instance_to_load_balancer(instance_id, load_balancer_name)
+    @elb.register_instances_with_load_balancer(:load_balancer_name => load_balancer_name,
+                                               :instances => [instance_id])
+  end
+  
   def sleep_till_ssh_is_open(host)
     while ssh_open?(host) do
       sleep(3)

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alfonso Jimenez