rig 0.6.4 → 0.6.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.6.4:
+* add support for setting stickiness policy with DSL 'sticky' method on balancers
+* clean up waiting for dns on environment create/save
+* clean up mongo plugin
+
 ## v0.6.3:
 * minor bug fixes
 * clean up 'server tags' command, need to look at the rest

data/lib/rig/command/balancer.rb

@@ -89,13 +89,32 @@ module Rig
       subcommand "view", "view load balancer information" do
         include Options::ShowAll
 
-        parameter "NAME", "name of instance"
+        parameter "NAME", "name of the balancer"
 
         def execute
           item = Rig::Model::Balancer.find(name)
           puts item.attributes.to_yaml
         end
       end
+
+      subcommand "sticky", "set sticky policy" do
+
+        parameter "NAME", "name of the balancer"
+
+        option %w{-d --delete}, :flag, "delete policy"
+        option %w{-p --policy}, "POLICY", "policy name", :default => "AWSConsolePolicy-1"
+        option %w{-l --listener}, "LISTENER", "the listener port", :default => "443"
+        option %w{-t --type}, "TYPE", "the sticky policy type (lb or app)", :default => "lb"
+        option %w{-e --expires}, "EXPIRES", "the expiration period for lb type or cookie for app type", :default => "300"
+
+        def execute
+          if delete?
+            Rig::Model::Balancer.unsticky(name, type, expires, listener, policy)
+          else
+            Rig::Model::Balancer.sticky(name, type, expires, listener, policy)
+          end
+        end
+      end
     end
   end
 end

data/lib/rig/model/balancer.rb

@@ -79,6 +79,38 @@ module Rig
           match.first.destroy
         end
 
+        def sticky(balancer_name, type, expires_or_cookie, listener="443", policy_name='RigLbCookiePolicy')
+          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)
+              Rig::Connection.balancer.set_load_balancer_policies_of_listener(balancer_name, listener.to_i, [policy_name])
+            when :lb, :load_balancer
+              Rig::Connection.balancer.create_lb_cookie_stickiness_policy(balancer_name, policy_name, expires_or_cookie.to_i)
+              Rig::Connection.balancer.set_load_balancer_policies_of_listener(balancer_name, listener.to_i, [policy_name])
+            else
+              raise "unknown sticky type #{type}"
+          end
+        end
+
+        def unsticky(balancer_name, type, expires_or_cookie, listener="443", policy_name='RigLbCookiePolicy')
+          elb = find(balancer_name)
+          raise "balancer #{balancer_name} not found" unless elb
+
+          case type.to_sym
+            when :app, :application
+              Rig::Connection.balancer.set_load_balancer_policies_of_listener(balancer_name, listener.to_i, [])
+              Rig::Connection.balancer.delete_load_balancer_policy(balancer_name, policy_name)
+            when :lb, :load_balancer
+              Rig::Connection.balancer.set_load_balancer_policies_of_listener(balancer_name, listener.to_i, [])
+              Rig::Connection.balancer.delete_load_balancer_policy(balancer_name, policy_name)
+            else
+              raise "unknown sticky type #{type}"
+          end
+        end
+
         private
 
         def new_listener_description(listener)
@@ -99,19 +131,6 @@ 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/environment.rb

@@ -114,17 +114,23 @@ module Rig
               Rig::Log.info ".. primary: #{name}.env.#@zone #{balancer.attributes[:dns_name]}"
               Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name], :ttl => 30)
             end
+          end
+        end
+
+        wait_for_dns
 
+        @template.balancers.each do |b|
+          if set[b.name]
             if b.sticky
-              Rig::Log.info ".. setting stickiness policy"
+              Rig::Log.info "#@name-#{b.name}: setting stickiness policy"
               policy_name = 'RigLBStickinessPolicy'
               type = b.sticky_type
               expires_or_cookie = b.sticky_arg
               case type.to_sym
                 when :app, :application
-                  Rig::Connection.balancer.create_app_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
+                  ap Rig::Connection.balancer.create_app_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
                 when :lb, :load_balancer
-                  Rig::Connection.balancer.create_lb_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
+                  ap Rig::Connection.balancer.create_lb_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
                 else
                   raise "unknown sticky type #{type}"
               end
@@ -132,8 +138,6 @@ module Rig
           end
         end
 
-        wait_for_dns
-
         Rig::Log.info "associating servers' DNS"
         @dnsdelayed.each do |h|
           server = @server_hash[h[:server]]
@@ -204,6 +208,7 @@ module Rig
       private
 
       def wait_for_dns
+        Rig::Log.info "waiting for servers..."
         while servers_without_dns > 0
           sleep 2
           reload

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 6
-      TINY  = 4
+      TINY  = 5
       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.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors: