awsborn 0.1.1 → 0.2.0

data/README.mdown

@@ -30,6 +30,7 @@ that are not running.
       security_group   'Basic web'
       keys             'keys/*.pub'
       bootstrap_script 'chef-bootstrap.sh'
+      monitor          true
     end
 
     log_servers = LogServer.cluster do
@@ -179,6 +180,9 @@ attached and the other isn't, one of these things will happen:
 * Hack RightAws to verify certificates.
 * Elastic Load Balancing.
 * Launch servers in parallel.
+* Make `image_id` a hash with different AMIs for different instance types.
+* Make `image_id` overridable per server.
+
 
 ## Note on Patches/Pull Requests
 

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "david@icehouse.se"
     gem.homepage = "http://github.com/icehouse/awsborn"
     gem.authors = ["David Vrensk"]
-    gem.add_dependency "right_aws", ">= 1.10.0"
+    gem.add_dependency "icehouse-right_aws", ">= 1.11.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "webmock", ">= 0.9.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/awsborn/awsborn.rb

@@ -1,12 +1,13 @@
 module Awsborn
   class SecurityError < StandardError ; end
+  class ServerError < StandardError ; end
 
   class << self
     attr_writer :access_key_id, :secret_access_key, :logger
     attr_accessor :verbose
-  
+
     Awsborn.verbose = true
-  
+
     def access_key_id
       @access_key_id ||= ENV['AMAZON_ACCESS_KEY_ID'] 
     end

data/lib/awsborn/ec2.rb

@@ -1,6 +1,8 @@
 module Awsborn
   class Ec2
-
+    extend Forwardable
+    def_delegators :Awsborn, :logger
+    
     attr_accessor :instance_id
 
     def connection
@@ -45,17 +47,12 @@ module Awsborn
     def delete_key_pair (key_pair)
       connection.delete_key_pair(key_pair.name)
     end
-    
-    def volume_has_instance? (volume_id)
+
+    def instance_id_for_volume (volume_id)
       response = connection.describe_volumes(volume_id).first
-      if response[:aws_status] == 'in-use'
-        self.instance_id = response[:aws_instance_id]
-        true
-      else
-        false
-      end
+      response[:aws_status] == 'in-use' ? response[:aws_instance_id] : nil
     end
-    
+
     IP4_REGEXP = /^(\d{1,3}\.){3}\d{1,3}$/
 
     def associate_address (address)
@@ -83,5 +80,20 @@ module Awsborn
     def attach_volume (volume, device)
       connection.attach_volume(volume, instance_id, device)
     end
+
+    def monitoring?
+      %w[enabled pending].include?(describe_instance[:monitoring_state])
+    end
+    
+    def monitor
+      logger.debug "Activating monitoring for #{instance_id}"
+      connection.monitor_instances(instance_id)
+    end
+
+    def unmonitor
+      logger.debug "Deactivating monitoring for #{instance_id}"
+      connection.unmonitor_instances(instance_id)
+    end
+
   end
 end

data/lib/awsborn/server.rb

@@ -36,6 +36,10 @@ module Awsborn
         @bootstrap_script = args.first unless args.empty?
         @bootstrap_script
       end
+      def monitor (*args)
+        @monitor = args.first unless args.empty?
+        @monitor
+      end
       
       def cluster (&block)
         ServerCluster.build self, &block
@@ -45,12 +49,37 @@ module Awsborn
       end
     end
 
-    def one_of_my_disks_is_attached_to_a_running_instance?
-      vol_id = disk.values.first
-      ec2.volume_has_instance?(vol_id)
+    def running?
+      map = {}
+      disk.values.each { |vol_id| map[vol_id] = ec2.instance_id_for_volume(vol_id) }
+      ids = map.values.uniq
+      if ids.size > 1
+        raise ServerError, "Volumes for #{self.class.name}:#{name} are connected to several instances: #{map.inspect}"
+      end
+      ec2.instance_id = ids.first
     end
-    alias :running? :one_of_my_disks_is_attached_to_a_running_instance?
 
+    def refresh
+      start_or_stop_monitoring unless monitor.nil?
+      associate_address if elastic_ip
+      
+      begin
+        update_known_hosts
+        install_ssh_keys if keys
+      rescue SecurityError => e
+        logger.warn "Could not update known_hosts for #{name}:"
+        logger.warn e
+      end
+    end
+    
+    def start_or_stop_monitoring
+      if monitor && ! ec2.monitoring?
+        ec2.monitor
+      elsif ec2.monitoring? && ! monitor
+        ec2.unmonitor
+      end
+    end
+    
     def start (key_pair)
       launch_instance(key_pair)
 
@@ -71,7 +100,8 @@ module Awsborn
         :instance_type => constant(instance_type),
         :availability_zone => constant(zone),
         :key_name => key_pair.name,
-        :group_ids => security_group
+        :group_ids => security_group,
+        :monitor_enabled => monitor
       )
       logger.debug @launch_response
 
@@ -83,33 +113,42 @@ module Awsborn
       KnownHostsUpdater.update_for_server self
     end
     
-    def install_ssh_keys (temp_key_pair)
-      cmd = "ssh -i #{temp_key_pair.path} #{sudo_user || 'root'}@#{aws_dns_name} 'cat > .ssh/authorized_keys'"
-      logger.debug cmd
-      IO.popen(cmd, "w") do |pipe|
+    def install_ssh_keys (temp_key_pair = nil)
+      logger.debug "Installing ssh keys on #{name}"
+      raise ArgumentError, "No host_name for #{name}" unless host_name
+      install_ssh_keys_for_sudo_user_or_root (temp_key_pair)
+      copy_sudo_users_keys_to_root if sudo_user
+    end
+
+    def install_ssh_keys_for_sudo_user_or_root (temp_key_pair)
+      current_key = "-i #{temp_key_pair.path}" if temp_key_pair
+      IO.popen("ssh #{current_key} #{sudo_user || 'root'}@#{host_name} 'cat > .ssh/authorized_keys'", "w") do |pipe|
         pipe.puts key_data
       end
-      if sudo_user
-        system("ssh #{sudo_user}@#{aws_dns_name} 'sudo cp .ssh/authorized_keys /root/.ssh/authorized_keys'")
-      end
     end
-
+    
     def key_data
       Dir[*keys].inject([]) do |memo, file_name|
         memo + File.readlines(file_name).map { |line| line.chomp }
       end.join("\n")
     end
 
+    def copy_sudo_users_keys_to_root
+      system("ssh #{sudo_user}@#{host_name} 'sudo cp .ssh/authorized_keys /root/.ssh/authorized_keys'")
+    end
+    
     def path_relative_to_script (path)
       File.join(File.dirname(File.expand_path($0)), path)
     end
     
     def associate_address
+      logger.debug "Associating address #{elastic_ip} to #{name}"
       ec2.associate_address(elastic_ip)
       self.host_name = elastic_ip
     end
 
     def bootstrap
+      logger.debug "Bootstrapping #{name}"
       script = path_relative_to_script(bootstrap_script)
       basename = File.basename(script)
       system "scp #{script} root@#{elastic_ip}:/tmp"
@@ -117,6 +156,7 @@ module Awsborn
     end
     
     def attach_volumes
+      logger.debug "Attaching volumes #{disk.values.join(', ')} to #{name}"
       disk.each_pair do |device, volume|
         device = "/dev/#{device}" if device.is_a?(Symbol) || ! device.match('/')
         res = ec2.attach_volume(volume, device)
@@ -129,6 +169,10 @@ module Awsborn
     
     begin :accessors
       attr_accessor :name, :host_name, :logger
+      def host_name= (string)
+        logger.debug "Setting host_name of #{name} to #{string}"
+        @host_name = string
+      end
       def zone
         @options[:zone]
       end
@@ -153,6 +197,9 @@ module Awsborn
       def keys
         @options[:keys] || self.class.keys
       end
+      def monitor
+        @options[:monitor] || self.class.monitor
+      end
       def elastic_ip
         @options[:ip]
       end

data/lib/awsborn/server_cluster.rb

@@ -23,19 +23,19 @@ module Awsborn
     end
 
     def launch
-      start_missing_instances
+      running, missing = @instances.partition { |e| e.running? }
+      refresh_running(running) if running.any?
+      start_missing_instances(missing) if missing.any?
     end
 
-    def start_missing_instances
-      to_start = find_missing_instances
-      return if to_start.empty?
-      generate_key_pair(to_start)
-      to_start.each { |e| e.start(@key_pair) }
-      delete_key_pair(to_start)
+    def refresh_running (instances)
+      instances.each { |e| e.refresh }
     end
 
-    def find_missing_instances
-      @instances.reject { |e| e.running? }
+    def start_missing_instances (instances)
+      generate_key_pair(instances)
+      instances.each { |e| e.start(@key_pair) }
+      delete_key_pair(instances)
     end
 
     def generate_key_pair (instances)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +02:00
+date: 2010-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: icehouse-right_aws
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 10
+        - 11
         - 0
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency