rig 0.6.2 → 0.6.3

data/bin/rig

@@ -2,4 +2,9 @@
 require 'rig'
 require 'rig/command'
 
-Rig::Command::Main.run
+begin
+  Rig::Command::Main.run
+rescue => e
+  Rig::Log.info "** #{e.message}"
+  Rig::Log.trace e.backtrace
+end

data/conf/userdata/chef/userdata.sh.erb

@@ -25,10 +25,10 @@ update_rubygems
 gem install <%= gem %> --no-ri --no-rdoc
 <% end %>
 
-cat <<FACTS > /etc/facts.yml
-rig_name: <%= @name %>
-rig_roles: <%= @roles.join(",") %>
-rig_environment: <%= @environment %>
+cat <<FACTS > /etc/rig.yml
+name: <%= @name %>
+roles: <%= @roles.join(",") %>
+environment: <%= @environment %>
 FACTS
 
 cat <<JSON > /etc/chef/bootstrap.json
@@ -52,6 +52,8 @@ file_backup_path        "/var/backups/chef"
 pid_file                "/var/run/chef/client.pid"
 node_name               "<%= @name %>";
 Chef::Log::Formatter.show_time = true
+
+Ohai::Config[:plugin_path] << '/etc/ohai/plugins'
 CLIENT
 
 <% @files.each do |file|; local = file["local"]; remote = file["remote"] %>

data/lib/rig/capistrano.rb

@@ -9,8 +9,8 @@ require 'capistrano'
 module Rig
   module Capistrano
     def servers
-      env     = ENV['ENVIRONMENT'] || Rig.config[:environment]
-      role    = ENV['ROLE'] || Rig.config[:role]
+      env     = Rig.config[:environment]
+      role    = Rig.config[:role]
       servers = Rig::Model::Environment.find(env).servers
       list    = role == 'all' ? servers : servers.select { |s| (s.tags['Roles']||"").split(",").include?(role) }
 
@@ -33,8 +33,8 @@ configuration = Capistrano::Configuration.respond_to?(:instance) ?
 configuration.load do
   puts "  * reading rig information..."
 
-  Rig.config[:environment] = ARGV[0]
-  Rig.config[:role]      = ARGV[1]
+  Rig.config[:environment] = ENV['ENVIRONMENT'] || ARGV[0]
+  Rig.config[:role]        = ENV['ROLE'] || ARGV[1]
 
   # create dummy tasks for environment and role
   begin

data/lib/rig/command/abstract.rb

@@ -17,6 +17,10 @@ module Rig
         exit(0)
       end
 
+      option %w{-d --debug}, :flag, "debug logging" do |d|
+        Rig::Log.level = :debug
+      end
+
       def print_table(columns, rows)
         puts table(columns, *rows)
       end

data/lib/rig/command/server.rb

@@ -14,13 +14,13 @@ module Rig
         option %w{--add}, :flag, "add this to the existing servers of this role and environment"
         option "--[no-]chef", :flag, "use chef to bootstrap", :default => true
 
+        parameter "NAME", "the name of the server, will automatically add a number"
         parameter "ENVIRONMENT", "the environment this server should belong to"
-        parameter "ROLE", "the server role", :default => 'solo'
+        parameter "ROLE ...", "the server roles"
 
         def execute
-          name = role
           # figure out if there are others of this role, if there are add a number to name to distinguish.
-          n    = "#{name}.#{environment}.env"
+          n    = "#{name}1.#{environment}.env"
           chef = Rig.config[:chef] ? true : false
 
           unless flavor
@@ -32,9 +32,9 @@ module Rig
               :flavor_id => flavor,
               :key_name  => keypair,
               :groups    => groups.split(','),
-              :user_data => Rig::Model::Userdata.create(n, role, environment, :chef => chef)
+              :user_data => Rig::Model::Userdata.create(n, role_list, environment, :chef => chef)
           }
-          tags   = { 'Name' => n, 'Environment' => environment, 'Role' => role }
+          tags   = { 'Name' => n, 'Environment' => environment, 'Role' => role_list.join(",") }
           server = Rig::Model::Instance.create(o, tags)
           puts "created: #{server.id}"
         rescue => e
@@ -42,6 +42,10 @@ module Rig
           raise Clamp::HelpWanted, self
         end
 
+        def default_flavor
+          Rig.account[:flavor]
+        end
+
         def default_image
           Rig.account[:image].is_a?(Hash) ? Rig.account[:image].first.last : Rig.account[:image]
         end
@@ -84,8 +88,10 @@ module Rig
           parameter "NAME", "the name of the server to get tags for"
 
           def execute
-            instance = Rig::Model::Instance.find(name)
-            raise "server not found #{name}" unless instance
+            list = Rig::Model::Instance.find(name)
+            raise "server not found #{name}" unless list && list.count > 0
+            raise "search found more than one server" if list.count > 1
+            instance = list.first
             puts "#{instance.tags.inspect}"
           end
         end

data/lib/rig/log.rb

@@ -22,7 +22,7 @@ module Rig
             console_level = LEVELS[console_config[:level].to_sym]
           end
           console.level = console_level || Logger::INFO
-          add(console, proc {|s, _, _, m| "#{m}\n"})
+          add(console, proc {|s, _, _, m| "#{"debug: " if s=='DEBUG'}#{m}\n"})
 
           logging.each do |name, data|
             level = data[:level]
@@ -71,6 +71,13 @@ module Rig
           end
         METHOD_DEFN
       end
+
+      def trace(backtrace)
+        debug   "trace: #{backtrace.shift}"
+        backtrace.each do |l|
+          debug "       #{l}"
+        end
+      end
     end
   end
 end

data/lib/rig/model/balancer.rb

@@ -99,6 +99,19 @@ module Rig
               'PolicyNames' => policy_names
           }
         end
+
+        def sticky(type, balancer_name, expires_or_cookie, policy_name='LBCookieStickinessPolicy')
+          elb = find(balancer_name)
+          raise "balancer #{balancer_name} not found" unless elb
+          case type.to_sym
+            when :app, :application
+              Rig::Connection.balancer.create_app_cookie_stickiness_policy(balancer_name, policy_name, expires_or_cookie)
+            when :lb, :load_balancer
+              Rig::Connection.balancer.create_lb_cookie_stickiness_policy(balancer_name, policy_name, expires_or_cookie)
+            else
+              raise "unknown sticky type #{type}"
+          end
+        end
       end
     end
   end

data/lib/rig/model/dns.rb

@@ -49,6 +49,25 @@ module Rig
             Rig::Log.info "record not found: #{name}"
           end
         end
+
+        def remove_environment(name)
+          zone = zone(Rig.get_config(:dns_zone))
+          list = zone.records.all.select {|e| e.attributes[:name] =~ /\.#{name}\.env/ }
+          list.each do |e|
+            Rig::Log.info "record: #{e.attributes[:name]}"
+            destroy(e.attributes[:name])
+          end
+        end
+
+        def remove_instance(dns)
+          zone = zone(Rig.get_config(:dns_zone))
+          dns = dns.gsub(/\.$/, '')
+          list = zone.records.all.select {|e| e.attributes[:value] == "#{dns}." }
+          list.each do |e|
+            Rig::Log.info "record: #{e.attributes[:name]}"
+            destroy(e.attributes[:name])
+          end
+        end
       end
     end
   end

data/lib/rig/model/environment.rb

@@ -49,11 +49,12 @@ module Rig
 
         }.merge(opts)
 
-        @name      = name
-        @template  = Rig.get_template(template) unless template.nil?
+        @name = name
+        @template = Rig.get_template(template) unless template.nil?
         @template_name = template
-        @servers   = []
-        @balancers = []
+        @servers       = []
+        @dnsdelayed    = []
+        @balancers     = []
       end
 
       def save
@@ -62,14 +63,17 @@ module Rig
         set = { }
 
         @template.servers.each do |s|
+          Rig::Log.debug "server[#{s.count}]= #{s.inspect}"
           1.upto(s.count) do |i|
             n = "#{s.name}#{i}.#@name.env"
+            Rig::Log.debug "  name= #{n}"
+            userdata = s.userdata || Rig.get_config(:userdata)
             o = {
                 :image_id  => s.image || @image,
                 :flavor_id => s.flavor || @flavor,
                 :key_name  => s.keypair || @keypair,
                 :groups    => s.groups || @groups,
-                :user_data => Rig::Model::Userdata.create(n, s.roles, @name)
+                :user_data => Rig::Model::Userdata.create(n, s.roles, @name, :package => userdata)
             }
 
             # throw this error, because Fog and AWS don't care if you don't set a keypair
@@ -78,9 +82,22 @@ module Rig
 
             Rig::Log.info "creating instance: name:#{n} environment:#@name roles:#{s.roles.inspect}"
             instance = Rig::Model::Instance.create(o, 'Name' => n, 'Environment' => name, 'Roles' => s.roles.join(","))
-            set[s.balancer] ||= []
-            set[s.balancer] << instance if s.balancer
+            if s.balancer
+              set[s.balancer] ||= []
+              set[s.balancer] << instance
+            end
             @servers << instance
+            @dnsdelayed << {
+                :server => instance.id,
+            }
+            if s.count == 1 && s.dnsnames.count > 0
+              s.dnsnames.each do |dns|
+                @dnsdelayed << {
+                    :record => "#{dns}.#{Rig.get_config(:dns_zone)}",
+                    :server => instance.id,
+                }
+              end
+            end
           end
         end
 
@@ -100,22 +117,31 @@ module Rig
           end
         end
 
-        Rig::Log.info "sleeping 3 seconds"
-        sleep 3
-        reload
+        server_count = @servers.count
+        Rig::Log.info "waiting "
+        begin
+          sleep 1
+          reload
+          Rig::Log.info " . #{server_count} != #{@servers.count} : dns=#{@servers.select{|e| e.dns_name.nil? }.count == 0}"
+        end while server_count != @servers.count && @servers.select{|e| e.dns_name.nil? }.count == 0
 
         Rig::Log.info "associating servers' DNS"
-        @servers.each do |server|
-          record = "#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}"
+        @dnsdelayed.each do |h|
+          server = @server_hash[h[:server]]
+          record = h[:record]
+          record ||= "#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}" if server.tags
+          next unless record
           dns    = server.attributes[:dns_name]
           ip     = server.attributes[:public_ip_address]
 
           Rig::Log.info ".. #{record} dns=#{dns} ip=#{ip}"
-          if dns
-            Rig::Model::Dns.create(record, dns)
-          else
-            Rig::Log.warn "server #{server.id} doesn't have public_ip_address"
+
+          unless dns
+            Rig::Log.warn "server #{server.id} doesn't have dns_name"
+            next
           end
+
+          Rig::Model::Dns.create(record, dns)
         end
 
         Rig::Plugin.run "environment:create", self
@@ -125,14 +151,18 @@ module Rig
       end
 
       def destroy
-        Rig::Log.info "removing dns from servers"
+        Rig::Log.info "removing all server dns entries"
         @servers.each do |server|
-          Rig::Model::Dns.destroy("#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}") if server.tags['Name']
+          #Rig::Model::Dns.destroy("#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}") if server.tags['Name']
+          Rig::Model::Dns.remove_instance(server.dns_name) if server.dns_name
         end
+        Rig::Log.info "removing all environment dns entries"
+        Rig::Model::Dns.remove_environment(@name)
+
 
         roles = @servers.collect { |s| s.tags['Role'] }.compact
         roles.each do |r|
-          Rig::Log.info "removing role balancer dns"
+          Rig::Log.info "removing role balancer dns (#{r})"
           Rig::Model::Dns.destroy("#{r}.#{name}.env.#{Rig.get_config(:dns_zone)}")
         end
 
@@ -183,6 +213,7 @@ module Rig
 
       def find_servers
         @servers = Rig::Model::Instance.find_by_environment(@name) || []
+        @server_hash = @servers.inject({}){|h, e| h[e.id] = e; h}
       end
 
       def find_balancers

data/lib/rig/model/userdata.rb

@@ -6,7 +6,7 @@ module Rig
     class Userdata
       class << self
         def create(name, roles, environment, opts={ })
-          package = Rig.get_config(:userdata)
+          package = opts.delete(:package) || Rig.get_config(:userdata)
           directory = "#{Rig::Config.dir}/userdata/#{package}"
           config = YAML.load_file("#{directory}/userdata.yml")
 

data/lib/rig/template.rb

@@ -64,55 +64,97 @@ module Rig
       end
     end
 
-    class Server
-      attr_reader :name, :roles, :groups
+    class Base
+      def attr(name, value=nil)
+        @attrs[name] = value unless value.nil?
+        @attrs[name]
+      end
+
+      def list_attr(name, value=nil)
+        @attrs[name] ||= []
+        unless value.nil?
+          if value.kind_of?(Array)
+            @attrs[name] += value
+          else
+            @attrs[name] << value
+          end
+        end
+        @attrs[name]
+      end
+    end
 
+    class Server < Base
       def initialize(name)
-        @name     = name.to_sym
-        @roles    = []
-        @groups   = []
-        @count    = 1
-        @image    = nil
-        @flavor   = nil
-        @keypair  = nil
-        @userdata = "default"
+        @attrs = {
+            :name     => name.to_sym,
+            :roles    => [],
+            :groups   => [],
+            :count    => 1,
+            :image    => nil,
+            :flavor   => nil,
+            :keypair  => nil,
+            :userdata => "default",
+            :dnsnames => [],
+        }
+      end
+
+      def name
+        @attrs[:name]
+      end
+      def roles
+        @attrs[:roles]
+      end
+      def groups
+        @attrs[:groups]
+      end
+      def dnsnames
+        @attrs[:dnsnames]
       end
 
       def role(r)
-        @roles << r
+        list_attr(:roles, r)
       end
 
       def count(c=nil)
-        c.nil? ? @count : @count = c
+        attr(:count, c)
       end
 
       def image(i=nil)
-        i.nil? ? @image : @image = i
+        attr(:image, i)
       end
 
       def flavor(f=nil)
-        f.nil? ? @flavor : @flavor = f
+        attr(:flavor, f)
       end
 
       def group(g)
-        @groups << g
+        list_attr(:groups, g)
       end
 
       def keypair(k=nil)
-        k.nil? ? @keypair : @keypair = k
+        attr(:keypair, k)
       end
 
       def userdata(u=nil)
-        u.nil? ? @userdata : @userdata = u.to_sym
+        attr(:userdata, u)
       end
 
-      def balancer(b=nil)
-        b.nil? ? @balancer : @balancer = b.to_sym
+      def balancer(b=nil, &block)
+        if block_given?
+          raise "balancer block must specify name" unless b
+          Rig::Template::DSL.balancer(b, &block)
+        end
+        attr(:balancer, b)
+      end
+
+      def dns(name)
+        n = name.gsub(Rig.get_config(:dns_zone), "")
+        list_attr(:dnsnames, n)
       end
     end
 
     class Balancer
-      attr_reader :name
+      attr_reader :name, :sticky_type, :sticky_arg
 
       def initialize(name)
         @listeners = []
@@ -131,7 +173,12 @@ module Rig
       end
 
       def listeners
-        @listeners.map {|e| e.spec}
+        @listeners.map { |e| e.spec }
+      end
+
+      def sticky(type, expires_or_cookie)
+        @sticky_type = type
+        @sticky_arg = expires_or_cookie
       end
     end
 
@@ -160,9 +207,9 @@ module Rig
 
       def spec
         {
-          :from => "#@from_proto:#@from_port",
-          :to => "#@to_proto:#@to_port",
-          :cert => @cert,
+            :from => "#@from_proto:#@from_port",
+            :to   => "#@to_proto:#@to_port",
+            :cert => @cert,
         }
       end
     end

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 6
-      TINY  = 2
+      TINY  = 3
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rig
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp