sml-rubber 0.9.11 → 0.9.13

data/TODO

@@ -5,4 +5,3 @@
 * add scripted failover to generated configs for:
     * remove web hosts from round robin on web host failure
     * db failover (promote slave replica? master-master replicas?  cluster?)
-* make passenger default template instead of mongrel

data/VERSION

@@ -1 +1 @@
-0.9.11
+0.9.13

data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -9,7 +9,7 @@ namespace :rubber do
     
     task :custom_install, :roles => :passenger do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        if [[ -z `ls /usr/lib/ruby/gems/*/gems/passenger-*/ext/apache2/mod_passenger.so 2> /dev/null` ]]; then
+        if [[ -z `ls /usr/lib/ruby/gems/*/gems/passenger-#{rubber_env.passenger_version}/ext/apache2/mod_passenger.so 2> /dev/null` ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
         fi
       ENDSCRIPT

data/lib/rubber/instance.rb

@@ -76,17 +76,18 @@ module Rubber
 
     # The configuration for a single instance
     class InstanceItem
-      attr_reader :name, :domain, :instance_id
-      attr_accessor :roles
+      attr_reader :name, :domain, :instance_id, :security_groups
+      attr_accessor :roles, :zone
       attr_accessor :external_host, :external_ip
       attr_accessor :internal_host, :internal_ip
       attr_accessor :static_ip, :volumes, :partitions
 
-      def initialize(name, domain, roles, instance_id)
+      def initialize(name, domain, roles, instance_id, security_group_list=[])
         @name = name
         @domain = domain
         @roles = roles
         @instance_id = instance_id
+        @security_groups = security_group_list
       end
 
       def full_name

data/lib/rubber/recipes/rubber/instances.rb

@@ -162,7 +162,7 @@ namespace :rubber do
 
     logger.info "Instance #{instance_id} created"
 
-    instance_item = Rubber::Configuration::InstanceItem.new(instance_alias, env.domain, instance_roles, instance_id)
+    instance_item = Rubber::Configuration::InstanceItem.new(instance_alias, env.domain, instance_roles, instance_id, security_groups)
     rubber_instances.add(instance_item)
     rubber_instances.save()
 
@@ -179,6 +179,7 @@ namespace :rubber do
         instance_item.external_host = instance[:external_host]
         instance_item.external_ip = instance[:external_ip]
         instance_item.internal_host = instance[:internal_host]
+        instance_item.zone = instance[:zone]
         rubber_instances.save()
 
         # setup amazon elastic ips if configured to do so
@@ -227,14 +228,18 @@ namespace :rubber do
 
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_alias)
     
-    instance = cloud.describe_instance(instance_item.instance_id).first
+    instance = cloud.describe_instances(instance_item.instance_id).first
 
     if instance[:state] == "running"
       logger.info "\nInstance running, fetching hostname/ip data"
       instance_item.external_host = instance[:external_host]
       instance_item.external_ip = instance[:external_ip]
       instance_item.internal_host = instance[:internal_host]
+      instance_item.zone = instance[:zone]
 
+      # setup amazon elastic ips if configured to do so
+      setup_static_ips
+      
       # Need to setup aliases so ssh doesn't give us errors when we
       # later try to connect to same ip but using alias
       setup_local_aliases
@@ -246,18 +251,24 @@ namespace :rubber do
       # so that we can update all aliases
       task :_get_ip, :hosts => instance_item.external_ip do
         instance_item.internal_ip = capture(print_ip_command).strip
+        rubber_instances.save()
+      end
+
+      # even though instance is running, sometimes ssh hasn't started yet,
+      # so retry on connect failure
+      begin
+        _get_ip
+      rescue ConnectionError
+        sleep 2
+        logger.info "Failed to connect to #{instance_alias} (#{instance_item.external_ip}), retrying"
+        retry
       end
-      # even though instance is running, we need to give ssh a chance
-      # to get started
-      sleep 5
-      _get_ip
+
 
       # Add the aliases for this instance to all other hosts
       setup_remote_aliases
       setup_dns_aliases
     end
-
-    rubber_instances.save()
   end
 
 

data/lib/rubber/recipes/rubber/security_groups.rb

@@ -98,7 +98,7 @@ namespace :rubber do
     groups = isolate_groups(groups) if rubber_env.isolate_security_groups
     group_keys = groups.keys.clone()
     
-    # For each group that does already exist in ec2
+    # For each group that does already exist in cloud
     cloud_groups = cloud.describe_security_groups()
     cloud_groups.each do |cloud_group|
       group_name = cloud_group[:name]
@@ -108,7 +108,7 @@ namespace :rubber do
 
       if group_keys.delete(group_name)
         # sync rules
-        logger.debug "Security Group already in ec2, syncing rules: #{group_name}"
+        logger.debug "Security Group already in cloud, syncing rules: #{group_name}"
         group = groups[group_name]
         rules = group['rules'].clone
         rule_maps = []
@@ -133,8 +133,8 @@ namespace :rubber do
             # rules match, don't need to do anything
             # logger.debug "Rule in sync: #{rule_map.inspect}"
           else
-            # rules don't match, remove them from ec2 and re-add below
-            answer = Capistrano::CLI.ui.ask("Rule '#{rule_map.inspect}' exists in ec2, but not locally, remove from ec2? [y/N]?: ")
+            # rules don't match, remove them from cloud and re-add below
+            answer = Capistrano::CLI.ui.ask("Rule '#{rule_map.inspect}' exists in cloud, but not locally, remove from cloud? [y/N]?: ")
             rule_map = Rubber::Util::symbolize_keys(rule_map)
             if rule_map[:source_group_name]
               cloud.remove_security_group_rule(group_name, nil, nil, nil, {:name => rule_map[:source_group_name], :account => rule_map[:source_group_account]})
@@ -160,12 +160,12 @@ namespace :rubber do
         end
       else
         # delete group
-        answer = Capistrano::CLI.ui.ask("Security group '#{group_name}' exists in ec2 but not locally, remove from ec2? [y/N]: ")
+        answer = Capistrano::CLI.ui.ask("Security group '#{group_name}' exists in cloud but not locally, remove from cloud? [y/N]: ")
         cloud.destroy_security_group(group_name) if answer =~ /^y/
       end
     end
 
-    # For each group that didnt already exist in ec2
+    # For each group that didnt already exist in cloud
     group_keys.each do |group_name|
       group = groups[group_name]
       logger.debug "Creating new security group: #{group_name}"

data/lib/rubber/recipes/rubber/setup.rb

@@ -332,18 +332,18 @@ namespace :rubber do
         to_install.delete_if {|g, v| installed.has_key?(g) } if gem_cmd == 'install'
         to_install_ver.delete_if {|g, v| installed.has_key?(g) && installed[g].include?(v) } 
 
-        # when versions are provided for a gem, rubygems fails unless versions
-        # are provided for all gems so we need to do the two groups separately
+        # rubygems can only do asingle versioned gem at a time so we need
+        # to do the two groups separately
+        # install versioned ones first so unversioned don't pull in a newer version
+        to_install_ver.each do |g, v|
+          system "#{cmd} #{g} -v #{v}"
+          fail "Unable to install versioned gem #{g}:#{v}" if $?.exitstatus > 0
+        end
         if to_install.size > 0
           gem_list = to_install.keys.join(' ')
           system "#{cmd} #{gem_list}"
           fail "Unable to install gems" if $?.exitstatus > 0
         end
-        if to_install_ver.size > 0
-          gem_list = to_install_ver.collect {|g, v| "#{g} -v #{v}"}.join(' ')
-          system "#{cmd} #{gem_list}"
-          fail "Unable to install versioned gems" if $?.exitstatus > 0
-        end
 
         'EOF'
       ENDSCRIPT

data/lib/rubber/tasks/rubber.rb

@@ -38,7 +38,7 @@ namespace :rubber do
       end
       env = cfg.environment.bind(roles, instance_alias)
       domain = env.domain
-      instance = Rubber::Configuration::InstanceItem.new(instance_alias, domain, role_items, 'dummyid')
+      instance = Rubber::Configuration::InstanceItem.new(instance_alias, domain, role_items, 'dummyid', ['dummygroup'])
       instance.external_host = instance.full_name
       instance.external_ip = "127.0.0.1"
       instance.internal_host = instance.full_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.13
 platform: ruby
 authors: 
 - Matt Conway