tass 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b188c163337f972c649a81c15bcba51a17357db
-  data.tar.gz: 554fe1dda1e8ba161e7373fc03b3b4d70ce95eca
+  metadata.gz: f3f94224d11a7c396b61b38b44d026139f06b038
+  data.tar.gz: 70597218851be9ffe6d8cd1eccef2db50d144a22
 SHA512:
-  metadata.gz: 9855457ee5c59c985f62df957c11a75cede3e42babbc183f77970960313763adb43e065f6b38559b033740c91d398b1248f24045c0a1980d54dc82b04f49544e
-  data.tar.gz: 698da97f5892acda9e4c7b3c8b4324170058776445455a56bf0304b623e8243a16e19979411d5d4a04cbfac6e9d2388b62894090f0fe6fe9355df6c5a79b0ad4
+  metadata.gz: 34905de3f29c57247d272728b3ca0a510703a8129a8148f23d843ce57b6a445fb4dcc37c97026c7631ecaf2f8c067645be3ffa4ec8be2dd6616abc557e35f411
+  data.tar.gz: 8750964d46b84e5e55b32ae5cc3909b8d0af0e402db82b14d4dda9f410234820183cda03f0754138c392a9f6ef2813ac4e396bf1de75f2602c048c52d976fc0e

data/lib/tapjoy/autoscaling_bootstrap.rb

@@ -40,10 +40,29 @@ module Tapjoy
       attr_accessor :scaler_name, :config_name, :create_elb
       attr_reader :elb_name
 
+      # If you're using AutoscalingBootstrap to create a new ELB, that name goes here
       def elb_name=(str)
         @elb_name = str
       end
 
+      # If you're using AutoscalingBootstrap to join to a list of existing ELBs, that array
+      # goes here. This list can include or not include the provided elb_name, the
+      # array + a custom elb_name will be uniq-ed before being passed to Amazon
+      def elb_list=(list)
+        @elb_list = list
+      end
+
+      def elb_list
+        @elb_list ||= []
+      end
+
+      # This is the list of elbs passed to the autoscaling configuration. It will include
+      # the created elb, as well as the specific list of elbs to join. It will call uniq
+      # on the list in case you accidentally specify the same elb twice
+      def elbs_to_join
+        (elb_list + [Tapjoy::AutoscalingBootstrap.elb_name]).uniq
+      end
+
       def policy
         @policy = Tapjoy::AutoscalingBootstrap::Autoscaling::Policy.new
       end
@@ -181,6 +200,7 @@ module Tapjoy
         puts new_config[:elb_name]
         Tapjoy::AutoscalingBootstrap.elb_name = new_config[:elb_name] || 'NaE'
         Tapjoy::AutoscalingBootstrap.create_elb = new_config[:create_elb]
+        Tapjoy::AutoscalingBootstrap.elb_list = new_config[:elb_list] || []
         user_data = self.generate_user_data(new_config)
         return new_config, aws_env, user_data
       end

data/lib/tapjoy/autoscaling_bootstrap/AWS/Autoscaling/group.rb

@@ -43,9 +43,11 @@ module Tapjoy
                 tags: Tapjoy::AutoscalingBootstrap::Autoscaling::Group.new.generate_tags(tags)
               }
 
-              if create_elb
+              # If we've chosen to explicitly create an ELB and assign to this ASG
+              # OR if we've given it a list of ELBs to join (or both)
+              if create_elb || !Tapjoy::AutoscalingBootstrap.elb_list.empty?
                 group_hash.merge!({
-                  load_balancer_names: [Tapjoy::AutoscalingBootstrap.elb_name],
+                  load_balancer_names: Tapjoy::AutoscalingBootstrap.elbs_to_join,
                   health_check_type: health_check_type,
                   health_check_grace_period: 300,
                   })

data/lib/tapjoy/autoscaling_bootstrap/version.rb

@@ -3,7 +3,7 @@ module Tapjoy
     module Version
       MAJOR = 0
       MINOR = 2
-      PATCH = 1
+      PATCH = 2
     end
 
     VERSION = [Version::MAJOR, Version::MINOR, Version::PATCH].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tass
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop