sml-rubber 0.9.6 → 0.9.7

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/generators/vulcanize/templates/base/config/deploy.rb

@@ -1,10 +1,8 @@
 # This is a sample Capistrano config file for rubber
 
-set :rails_env, RUBBER_ENV
-
 on :load do
   set :application, rubber_cfg.environment.bind().app_name
-  set :deploy_to,     "/mnt/#{application}-#{rails_env}"
+  set :deploy_to,     "/mnt/#{application}-#{RUBBER_ENV}"
 end
 
 # Use a simple directory tree copy here to make demo easier.
@@ -30,7 +28,7 @@ set :keep_releases, 3
 # (instance*.yml + rubber*.yml) for a deploy.  This gives us the
 # convenience of not having to checkin files for staging, as well as 
 # the safety of forcing it to be checked in for production.
-set :push_instance_config, rails_env != 'production'
+set :push_instance_config, RUBBER_ENV != 'production'
 
 # Allows the tasks defined to fail gracefully if there are no hosts for them.
 # Comment out or use "required_task" for default cap behavior of a hard failure
@@ -79,6 +77,6 @@ end
 # Uncomment this is you want to install gems defined in the rails environment.rb
 # after "deploy:update", "install_rails_gems"
 task :install_rails_gems do
-  sudo "sh -c 'cd #{current_path} && rake gems:install'"
+  sudo "sh -c 'cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
 end
 

data/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -121,6 +121,12 @@ assigned_security_groups: [default]
 # creation, so its good to have some empty ones predefined.
 auto_security_groups: true
 
+# OPTIONAL: Automatically isolate security groups for each appname/environment
+# by mangling their names to be appname_env_groupname
+# This makes it safer to have staging and production coexist on the same EC2
+# account, or even multiple apps
+isolate_security_groups: true
+
 # OPTIONAL: Set if you want to use Ruby Enterprise Edition instead of the standard ubuntu one
 use_enterprise_ruby: false
 

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

@@ -11,7 +11,7 @@ namespace :rubber do
       # Setup system to restart mongrel_cluster on reboot
       rubber.sudo_script 'install_app', <<-ENDSCRIPT
         mkdir -p /etc/mongrel_cluster
-        rm -f /etc/mongrel_cluster/#{application}-#{rails_env}.yml && ln -s /mnt/#{application}-#{rails_env}/current/config/mongrel_cluster.yml /etc/mongrel_cluster/#{application}-#{rails_env}.yml
+        rm -f /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml && ln -s /mnt/#{application}-#{RUBBER_ENV}/current/config/mongrel_cluster.yml /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml
         find /usr/lib/ruby/gems -path "*/resources/mongrel_cluster" -exec cp {} /etc/init.d/ \\;
         chmod +x /etc/init.d/mongrel_cluster
         update-rc.d -f mongrel_cluster remove

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

@@ -131,7 +131,7 @@ namespace :rubber do
       deploy.update_code
       
       # Gen just the conf for the given mysql role
-      rubber.run_config(:RUBBER_ENV => rails_env, :FILE => "role/#{role}|role/db/my.cnf", :deploy_path => release_path)
+      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/#{role}|role/db/my.cnf", :deploy_path => release_path)
     end
     
     after "rubber:install_packages", "rubber:mysql:custom_install"

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

@@ -61,7 +61,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_mgm /etc/mysql/ndb_mgmd.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:RUBBER_ENV => rails_env, :FILE => "role/mysql_mgm", :deploy_path => release_path)
+            rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_mgm", :deploy_path => release_path)
             sudo "/etc/init.d/mysql-ndb-mgm start"
           end
         end
@@ -73,7 +73,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_data /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:RUBBER_ENV => rails_env, :FILE => "role/mysql_data", :deploy_path => release_path)
+            rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_data", :deploy_path => release_path)
             sudo "/etc/init.d/mysql-ndb start-initial"
           end
         end
@@ -85,7 +85,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_sql /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:RUBBER_ENV => rails_env, :FILE => "role/mysql_sql", :deploy_path => release_path)
+            rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_sql", :deploy_path => release_path)
             sudo "/etc/init.d/mysql start"
             env = rubber_cfg.environment.bind()
             # For mysql 5.0 cluster, need to create users and database for EVERY sql node

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

@@ -112,19 +112,8 @@ namespace :rubber do
     env = rubber_cfg.environment.bind(role_names, instance_alias)
 
     # We need to use security_groups during create, so create them up front
-    security_groups = env.assigned_security_groups
-    security_group_defns = env.security_groups
-    if env.auto_security_groups
-      hosts = rubber_cfg.instance.collect{|ic| ic.name } + [instance_alias]
-      roles = (rubber_cfg.instance.all_roles + role_names).uniq
-      security_groups << instance_alias
-      security_groups += role_names
-      security_groups.uniq!
-      security_group_defns = inject_auto_security_groups(security_group_defns, hosts, roles)
-      sync_security_groups(security_group_defns)
-    else
-      sync_security_groups(security_group_defns)
-    end
+    setup_security_groups(instance_alias, role_names)
+    security_groups = get_assigned_security_groups(instance_alias, role_names)
 
     ami = env.cloud_providers[env.cloud_provider].image_id
     ami_type = env.cloud_providers[env.cloud_provider].image_type

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

@@ -6,16 +6,7 @@ namespace :rubber do
     Likewise, rules within a group will get created, and those not will be removed
   DESC
   required_task :setup_security_groups do
-    env = rubber_cfg.environment.bind()
-    security_group_defns = env.security_groups
-    if env.auto_security_groups
-      hosts = rubber_cfg.instance.collect{|ic| ic.name }
-      roles = rubber_cfg.instance.all_roles
-      security_group_defns = inject_auto_security_groups(security_group_defns, hosts, roles)
-      sync_security_groups(security_group_defns)
-    else
-      sync_security_groups(security_group_defns)
-    end
+    setup_security_groups()
   end
 
   desc <<-DESC
@@ -38,6 +29,31 @@ namespace :rubber do
   end
 
 
+  def get_assigned_security_groups(host=nil, roles=[])
+    env = rubber_cfg.environment.bind(roles, host)
+    security_groups = env.assigned_security_groups
+    if env.auto_security_groups
+      security_groups << host
+      security_groups += roles
+    end
+    security_groups = security_groups.uniq.compact
+    security_groups = security_groups.collect {|x| isolate_group_name(x) } if env.isolate_security_groups
+    return security_groups
+  end
+
+  def setup_security_groups(host=nil, roles=[])
+    env = rubber_cfg.environment.bind(roles, host)
+    security_group_defns = env.security_groups
+    if env.auto_security_groups
+      sghosts = (rubber_cfg.instance.collect{|ic| ic.name } + [host]).uniq.compact
+      sgroles = (rubber_cfg.instance.all_roles + roles).uniq.compact
+      security_group_defns = inject_auto_security_groups(security_group_defns, sghosts, sgroles)
+      sync_security_groups(security_group_defns)
+    else
+      sync_security_groups(security_group_defns)
+    end
+  end
+
   def inject_auto_security_groups(groups, hosts, roles)
     hosts.each do |name|
       group_name = name
@@ -50,17 +66,48 @@ namespace :rubber do
     return groups
   end
 
+  def isolate_prefix
+    env = rubber_cfg.environment.bind()
+    return "#{env.app_name}_#{RUBBER_ENV}_"
+  end
+
+  def isolate_group_name(group_name)
+    new_name = "#{isolate_prefix}#{group_name}"
+    return new_name
+  end
+
+  def isolate_groups(groups)
+    renamed = {}
+    groups.each do |name, group|
+      new_name = name =~ /^#{isolate_prefix}/ ? name : isolate_group_name(name)
+      new_group =  Marshal.load(Marshal.dump(group))
+      new_group['rules'].each do |rule|
+        old_ref_name = rule['source_group_name']
+        if old_ref_name && old_ref_name !~ /^#{isolate_prefix}/
+          rule['source_group_name'] = isolate_group_name(old_ref_name)
+        end
+      end
+      renamed[new_name] = new_group
+    end
+    return renamed
+  end
+
   def sync_security_groups(groups)
     env = rubber_cfg.environment.bind()
     return unless groups
 
     groups = Rubber::Util::stringify(groups)
+    groups = isolate_groups(groups) if env.isolate_security_groups
     group_keys = groups.keys.clone()
-
+    
     # For each group that does already exist in ec2
     cloud_groups = cloud.describe_security_groups()
     cloud_groups.each do |cloud_group|
       group_name = cloud_group[:name]
+
+      # skip those groups that don't belong to this project/env
+      next if env.isolate_security_groups && group_name !~ /^#{isolate_prefix}/
+
       if group_keys.delete(group_name)
         # sync rules
         logger.debug "Security Group already in ec2, syncing rules: #{group_name}"
@@ -114,14 +161,9 @@ namespace :rubber do
           end
         end
       else
-        # when using auto groups, get prompted too much to delete when
-        # switching between production/staging since the hosts aren't shared
-        # between the two environments
-        if env.force_security_group_cleanup || ! env.auto_security_groups
-          # delete group
-          answer = Capistrano::CLI.ui.ask("Security group '#{group_name}' exists in ec2 but not locally, remove from ec2? [y/N]: ")
-          cloud.destroy_security_group(group_name) if answer =~ /^y/
-        end
+        # delete group
+        answer = Capistrano::CLI.ui.ask("Security group '#{group_name}' exists in ec2 but not locally, remove from ec2? [y/N]: ")
+        cloud.destroy_security_group(group_name) if answer =~ /^y/
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency