openstudio-aws 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11aab221e2b60dbd26c91e73c8848e5fcb96ffe4
-  data.tar.gz: b8372199ce382aac34a9d33367f3bf8d4d9f8140
+  metadata.gz: 3ac6b743feca80ea6c1cc34f6ecd9f765504d52b
+  data.tar.gz: 19e378e4fc19eb4578e11a010ee4761a7f506d78
 SHA512:
-  metadata.gz: 5b1edf97000da8f3801d3521f19199dbb0cd1991d954a3a99c389a8c8c7501a688f5ceb553e10df7979285a0beaa8a70f151ce21924654fe66e0fdbfabcd4f7b
-  data.tar.gz: 95cfb9e1d72a04a13a9835712609589abfa448941e5338aede76cdb2b591fbc52b709a293af6ff02a28af66f6c0e54e5ed8a9f9835ca7a484e398e0cf0f45716
+  metadata.gz: c29dc7caf6cf02f2357a655986a9a1f0a57aaddb717447b037e94c0fb0bef81df919b9678f33317964321b3c837b8a2a4b2e05e3a75dfb0d303b675b9af45e6e
+  data.tar.gz: c34a468d431073cf7b69eb50325516152dcf69300242d0de2e4460f003b75b3b5c6288985f1adf3f4e3e7e39ad9b287ffe82287a651c6820a60d9b64b8517be9

data/lib/openstudio-aws.rb

@@ -13,9 +13,9 @@ rescue LoadError
   exit
 end
 
-require 'openstudio/aws/version'
 require 'openstudio/aws/aws'
 require 'openstudio/aws/config'
+require 'openstudio/aws/version'
 require 'openstudio/lib/openstudio_aws_instance'
 require 'openstudio/lib/openstudio_aws_wrapper'
 require 'openstudio/lib/ami_list'

data/lib/openstudio/aws/aws.rb

@@ -11,13 +11,13 @@ module OpenStudio
         config = {:access_key_id => @config.access_key, :secret_access_key => @config.secret_key, :region => "us-east-1", :ssl_verify_peer => false}
         @os_aws = OpenStudioAwsWrapper.new(config)
         @local_key_file_name = nil
-        
+
         @default_amis = OpenStudioAmis.new(1, "1.1.3").get_amis
       end
 
       # command line call to create a new instance.  This should be more tightly integrated with teh os-aws.rb gem
       def create_server(instance_data = {})
-        defaults = {instance_type: "m2.xlarge", image_id: @default_amis[:server]}
+        defaults = {instance_type: "m2.xlarge", image_id: @default_amis['server']}
         instance_data = defaults.merge(instance_data)
 
         @os_aws.create_or_retrieve_security_group("openstudio-worker-sg-v1")
@@ -59,13 +59,13 @@ module OpenStudio
       end
 
       def create_workers(number_of_instances, instance_data = {})
-        defaults = {instance_type: "m2.4xlarge", image_id: @default_amis[:worker]}
+        defaults = {instance_type: "m2.4xlarge", image_id: @default_amis['worker']}
         instance_data = defaults.merge(instance_data)
 
-        
+
         #todo: raise an exception if the instance type and image id don't match
         raise "Can't create workers without a server instance running" if @os_aws.server.nil?
-      
+
         @os_aws.launch_workers(instance_data[:image_id], instance_data[:instance_type], number_of_instances)
 
         ## append the information to the server_data hash that already exists
@@ -80,15 +80,15 @@ module OpenStudio
         #File.open("worker_data.json", "w") { |f| f << JSON.pretty_generate(worker_data) }
         #
         ## Print out some debugging commands (probably work on mac/linux only)
+        puts ""
+        puts "Worker SSH Command:"
         @os_aws.workers.each do |worker|
-          puts ""
-          puts "Worker SSH Command:"
           puts "ssh -i #{@local_key_file_name} ubuntu@#{worker.data[:dns]}"
         end
-        
+
         puts ""
         puts "Waiting for server/worker configurations"
-        
+
         @os_aws.configure_server_and_workers
       end
 

data/lib/openstudio/aws/version.rb

@@ -1,6 +1,6 @@
 module OpenStudio
   module Aws
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
     OPENSTUDIO_VERSION = "1.2.1"
   end
 end

data/lib/openstudio/lib/ami_list.rb

@@ -39,7 +39,6 @@ class OpenStudioAmis
 
     raise "Could not find any amis for #{@version}" if amis.nil?
 
-    puts amis.inspect
     amis
   end
 

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -41,18 +41,18 @@ class OpenStudioAwsInstance
 
 
   def launch_instance(image_id, instance_type, user_data)
-    logger.info("user_data #{user_data.inspect}")
-    result = @aws.run_instances(
-        {
-            :image_id => image_id,
-            :key_name => @key_pair_name,
-            :security_groups => [@security_group_name],
-            :user_data => Base64.encode64(user_data),
-            :instance_type => instance_type,
-            :min_count => 1,
-            :max_count => 1
-        }
-    )
+    #logger.info("user_data #{user_data.inspect}")
+    instance = {
+        :image_id => image_id,
+        :key_name => @key_pair_name,
+        :security_groups => [@security_group_name],
+        :user_data => Base64.encode64(user_data),
+        :instance_type => instance_type,
+        :min_count => 1,
+        :max_count => 1
+    }
+    #logger.info instance.inspect
+    result = @aws.run_instances(instance)
 
     # determine how many processors are suppose to be in this image (lookup for now?)
     processors = find_processors(instance_type)

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -208,6 +208,9 @@ class OpenStudioAwsWrapper
   def launch_server(image_id, instance_type)
     user_data = File.read(File.expand_path(File.dirname(__FILE__))+'/server_script.sh')
     @server = OpenStudioAwsInstance.new(@aws, :server, @key_pair_name, @security_group_name, @group_uuid, @private_key)
+    
+    raise "image_id is nil" if not image_id
+    raise "instance type is nil" if not instance_type
     @server.launch_instance(image_id, instance_type, user_data)
   end
 
@@ -219,11 +222,15 @@ class OpenStudioAwsWrapper
     logger.info("worker user_data #{user_data.inspect}")
     
     # thread the launching of the workers
-    threads = []
+    
     num.times do
       @workers << OpenStudioAwsInstance.new(@aws, :worker, @key_pair_name, @security_group_name, @group_uuid, @private_key)
+    end
+
+    threads = []
+    @workers.each do |worker|
       threads << Thread.new do
-        @workers.last.launch_instance(image_id, instance_type, user_data)
+        worker.launch_instance(image_id, instance_type, user_data)
       end
     end
     threads.each { |t| t.join }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Nicholas Long