continuent-tools-core 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ee92f1a8d4f2e609211c326b0fe054e9a048ad
-  data.tar.gz: 1a99ad83f75681fca485e740677e876d56fc519f
+  metadata.gz: 61c0fd7050e745e23b953ed0a2deee4423eaff82
+  data.tar.gz: 4d1ad1829623ec32ea08a68408a7d1c41cb067a7
 SHA512:
-  metadata.gz: e97a7d38b5089aa673929764ccac1fa0331921359143e241148d3e693288163c01051a5f13150e80a81996a592ffc167b662fa46d48b870fbe13c4488374295e
-  data.tar.gz: 9da41564c3b4534072dac80f4680fa207b95d6841e7921c5006d034103282d2c859c641b612ae995b7ccd33d0465aec668879dc73a1f065ab20a9834aad0e6ff
+  metadata.gz: 676a3ede37740ce80ad7eb803ef4a4cd11fee3b7bba4b23bedd5d142c662341d8ceaf42a7d60ecd5c719bb2576aa7503d894b3967d75c8738419c8d257f382e2
+  data.tar.gz: 8026fb1fe97b0b7fda0aadf846a064b487adec01cab01397c139144721f10e7ba6b518027da6389976c9ffe02ecb4a5c2c960f1fbd36eaaa1b44b24af65a4529

data/providers/awsec2.rb

@@ -75,55 +75,63 @@ class AWSEC2TungstenDirectoryProvider < TungstenDirectoryProvider
         
         begin
           region_ec2 = AWS::EC2.new(:region => region)
-          instances = region_ec2.instances().filter('instance-state-name', "running")
+          instances = nil
+          
+          AWS.start_memoizing
+          AWS.memoize do
+            instances = region_ec2.instances().filter('instance-state-name', "running")
 
-          if aws_info.has_key?("tag_key")
-            if aws_info.has_key?("tag_value")
-              instances = instances.with_tag(aws_info["tag_key"], aws_info["tag_value"])
+            if aws_info.has_key?("tag_key")
+              if aws_info.has_key?("tag_value")
+                instances = instances.with_tag(aws_info["tag_key"], aws_info["tag_value"])
+              else
+                instances = instances.tagged(aws_info["tag_key"])
+              end
             else
-              instances = instances.tagged(aws_info["tag_key"])
+              instances = instances.tagged('tungsten-ServerType')
             end
-          else
-            instances = instances.tagged('tungsten-ServerType')
-          end
-          instances.each{
-            |ins|
-            tags = ins.tags.to_h()
+            instances.each{
+              |ins|
+              tags = ins.tags.to_h()
           
-            name = tags.to_h()[hostname_tag]
+              name = tags.to_h()[hostname_tag]
             
-            if name.to_s() == "" && require_hostname_tag == false
-              # Allow the DEFAULT_HOSTNAME_TAG to be used as a backup
-              name = tags.to_h()[DEFAULT_HOSTNAME_TAG]
-            end
+              if name.to_s() == "" && require_hostname_tag == false
+                # Allow the DEFAULT_HOSTNAME_TAG to be used as a backup
+                name = tags.to_h()[DEFAULT_HOSTNAME_TAG]
+              end
             
-            if name.to_s() == ""
-              TU.error("Unable to identify the hostname for #{ins.id} in #{region}")
-            end
+              if name.to_s() == ""
+                TU.error("Unable to identify the hostname for #{ins.id} in #{region}")
+              end
           
           
-            if ins.vpc_id != nil
-              location = ins.availability_zone + "." + ins.vpc_id
-            else
-              location = ins.availability_zone
-            end
+              if ins.vpc_id != nil
+                location = ins.availability_zone + "." + ins.vpc_id
+              else
+                location = ins.availability_zone
+              end
           
-            TU.debug("Found #{ins.id}")
-            region_results[index][name] = {
-              'id' => ins.id.to_s(),
-              'hostname' => name,
-              'location' => location,
-              'public-address' => ins.public_ip_address,
-              'private-address' => ins.private_ip_address,
-              'tags' => tags.to_h(),
-              'provider' => "aws.ec2",
-              'autodetect-key' => @key
+              TU.debug("Found #{ins.id}")
+              region_results[index][name] = {
+                'id' => ins.id.to_s(),
+                'hostname' => name,
+                'location' => location,
+                'public-address' => ins.public_ip_address,
+                'private-address' => ins.private_ip_address,
+                'tags' => tags.to_h(),
+                'provider' => "aws.ec2",
+                'autodetect-key' => @key
+              }
             }
-          }
+          end
+          AWS.stop_memoizing
         rescue AWS::EC2::Errors::AuthFailure => af
           TU.debug("Unable to find instances in #{region}: #{af.message}. Operation will continue.")
+          AWS.stop_memoizing
         rescue => e
           TU.debug("Error finding instances in #{region}: #{e.message}")
+          AWS.stop_memoizing
           raise e
         end
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continuent-tools-core
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Continuent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure