openstudio-aws 0.3.2 → 0.4.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58446e6c6b933ab0dd7e9b37662135ed69f49b30
-  data.tar.gz: 5d3a66b33ae75198773aa12370045ef584e8da1e
+  metadata.gz: 0caae029f8b89a624ac2eae705dd9116f6fb73d6
+  data.tar.gz: 9027677347681dfda91f3b57bdf4266ec4da5822
 SHA512:
-  metadata.gz: 48ab27614c9e80e4dd8ffb0edf8afbc1ce9f3017dd8c94f56eb33e531136c263fb0815638bc9c66ce5e2c78e40dfb19d21481518cc4a66d36ec024816870256f
-  data.tar.gz: 5668f2229c8e525d22f64ae1796b512941dc8cb9f6680759ab7c0129b52f6d707cbf347363d1d4cf4381a218da5b4871703b6694e4a66d8c62c1ee18d9b35584
+  metadata.gz: 92220c6aa21ced920173e584686c10546bc92bb2c2d5668dc911668ffd7fb5c38ea34e4c82793f329e2a0d37d19602667afb03a76c81224ac9bfb004244f815b
+  data.tar.gz: c8b09f832050cc296425ee4a08b1cb95fba8002dd151a794b0fab0895afdf8752b197da29e7a476148ebdb827ae6fc6bd25ce05227ebf66968b93327bd138d58

data/.gitignore

@@ -15,6 +15,6 @@ spec/reports
 ~$*
 *.receipt
 rubocop-results.xml
+spec/output
 *.pem
-*.pub
-*.config
+*.pub

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 OpenStudio AWS Gem Change Log
 ==================================
 
-Version 0.3.2 (Unreleased)
+Version 0.4.0.alpha1
 -------------
 * Add a stable JSON file that can be used to flag which versions of the server are stable (used by OpenStudio PAT).
+* Remove all puts and replace with logger. This is required because OpenStudio PAT reads the result from the command line.
 * Add the method `describe_availability_zones` to the root AWS class
-* Prefer use of the access and secret key in the environment variables if defined
-* Support i2 instance ephemeral storage. These instances will take a bit longer to startup because the volumes are not yet created.
+* Add the method `total_instances_count` to the root AWS class
+* Add method to list status of all instances in the group
+* Add method to `delete_key_pair`
+* Add launch time to the server data struct
+* Add cloud watch class to calculate the cost
+* Add save_directory to override the default path to save private keys and server configuration files 
 
 Version 0.3.1
 -------------

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rspec', '~> 3.3'
+  gem 'rspec', '~> 3.2.0'
   gem 'ci_reporter_rspec'
   gem 'rubocop', '~> 0.31'
   gem 'rubocop-checkstyle_formatter', '~> 0.2'

data/lib/openstudio/aws/aws.rb

@@ -3,18 +3,29 @@ module OpenStudio
   module Aws
     VALID_OPTIONS = [
       :proxy, :credentials, :ami_lookup_version, :openstudio_version,
-      :openstudio_server_version, :region, :ssl_verify_peer, :host, :url, :stable
+      :openstudio_server_version, :region, :ssl_verify_peer, :host, :url, :stable,
+      :save_directory
     ]
 
     class Aws
+      include Logging
+
       # Deprecate OS_AWS object
       attr_reader :os_aws
       attr_reader :default_amis
+      attr_reader :save_directory
 
       # default constructor to create the AWS class that can spin up server and worker instances.
       # options are optional with the following support:
       #   credentials => {:access_key_id, :secret_access_key, :region, :ssl_verify_peer}
       #   proxy => {:host => "192.168.0.1", :port => "8808", :username => "user", :password => "password"}}
+      # @param options [Hash]
+      # @option options [Boolean] :openstudio_version Version of OpenStudio in which to do the lookup for the server
+      #   AMIs. This cannot be used in conjunction with the :openstudio_server_version.
+      # @option options [Boolean] :openstudio_server_version Version of OpenStudio Server in which to do the lookup for
+      #   the server AMIs. This cannot be used in conjunction with the :openstudio_server_version
+      # @option options [Boolean] :stable (false) Find a stable version less than or equal to the version that is passed in the
+      #   version field
       def initialize(options = {})
         invalid_options = options.keys - VALID_OPTIONS
         if invalid_options.any?
@@ -25,9 +36,15 @@ module OpenStudio
         defaults = {
           ami_lookup_version: 1,
           region: 'us-east-1',
-          ssl_verify_peer: false
+          ssl_verify_peer: false,
+          save_directory: '.'
         }
         options = defaults.merge(options)
+        logger.info "AWS initialized with the options: #{options.except(:credentials)}"
+
+        # set the save path
+        @save_directory = File.expand_path options[:save_directory]
+        FileUtils.mkdir_p @save_directory unless Dir.exist? @save_directory
 
         # read in the config.yml file to get the secret/private key
         if !options[:credentials]
@@ -53,19 +70,11 @@ module OpenStudio
           else
             proxy_uri = "https://#{options[:proxy][:host]}:#{options[:proxy][:port]}"
           end
-          # TODO: remove this proxy_uri and make a method to format correctly
           options[:proxy_uri] = proxy_uri
-
-          # TODO: do we need to escape a couple of the argument of username and password
-
-          # TODO: set some environment variables for system based proxy
         end
 
-        # puts "Final options are: #{options.inspect}"
-
         @os_aws = OpenStudioAwsWrapper.new(options)
-
-        @instances_filename = nil
+        @os_cloudwatch = OpenStudioCloudWatch.new(options)
 
         # this will grab the default version of openstudio ami versions
         # get the arugments for the AMI lookup
@@ -85,10 +94,10 @@ module OpenStudio
       #
       # end
 
-      # command line call to create a new instance.  This should be more tightly integrated with teh os-aws.rb gem
-      def create_server(options = {}, instances_filename = 'server_data.json')
+      # command line call to create a new instance.  This should be more tightly integrated with the os-aws.rb gem
+      def create_server(options = {})
         defaults = {
-          instance_type: 'm2.xlarge',
+          instance_type: 'm3.xlarge',
           security_groups: [],
           image_id: @default_amis[:server],
           user_id: 'unknown_user',
@@ -129,7 +138,7 @@ module OpenStudio
           @os_aws.private_key_file_name = options[:private_key_file_name]
         else
           # Save the private key if you did not pass in an already existing key_pair_name
-          @os_aws.save_private_key('ec2_server_key.pem')
+          @os_aws.save_private_key(@save_directory)
         end
 
         server_options = {
@@ -141,22 +150,30 @@ module OpenStudio
 
         # save the worker pem and public to the directory
         # presently, this will always overwrite the worker key, is that okay? Is this really needed later?
-        @os_aws.save_worker_keys('.')
+        @os_aws.save_worker_keys(@save_directory)
 
         # if instance_data[:ebs_volume_id]
         #   server_options[:ebs_volume_id] = instance_data[:ebs_volume_id]
         # end
 
         @os_aws.launch_server(options[:image_id], options[:instance_type], server_options)
+      end
 
-        @instances_filename = instances_filename
-        save_cluster_json @instances_filename
-
+      # Write out to the terminal the connection information for the servers and workers
+      #
+      # @return [nil] Only prints to the screen. No return is expected
+      def print_connection_info
         # Print out some debugging commands (probably work on mac/linux only)
         puts ''
         puts 'Server SSH Command:'
-
         puts "ssh -i #{@os_aws.private_key_file_name} ubuntu@#{@os_aws.server.data[:dns]}"
+        if @os_aws.workers.size > 0
+          puts ''
+          puts 'Worker SSH Command:'
+          @os_aws.workers.each do |worker|
+            puts "ssh -i #{@os_aws.private_key_file_name} ubuntu@#{worker.data[:dns]}"
+          end
+        end
       end
 
       def create_workers(number_of_instances, options = {}, user_id = 'unknown_user')
@@ -176,7 +193,7 @@ module OpenStudio
         }
         options = defaults.merge(options)
 
-        # for backwards compatibilty, still allow security_group
+        # for backwards compatibility, still allow security_group
         if options[:security_group]
           warn 'Pass security_groups as an array instead of security_group. security_group will be deprecated in 0.4.0'
           options[:security_groups] = [options[:security_group]]
@@ -189,10 +206,7 @@ module OpenStudio
 
         fail "Can't create workers without a server instance running" if @os_aws.server.nil?
 
-        if number_of_instances == 0
-          puts ''
-          puts 'No workers requested'
-        else
+        unless number_of_instances == 0
           worker_options = {
             user_id: options[:user_id],
             tags: options[:tags],
@@ -205,19 +219,9 @@ module OpenStudio
           # end
 
           @os_aws.launch_workers(options[:image_id], options[:instance_type], number_of_instances, worker_options)
-
-          # Add the worker data to the JSON
-          save_cluster_json @instances_filename
-
-          puts ''
-          puts 'Worker SSH Command:'
-          @os_aws.workers.each do |worker|
-            puts "ssh -i #{@os_aws.private_key_file_name} ubuntu@#{worker.data[:dns]}"
-          end
         end
 
-        puts ''
-        puts 'Waiting for server/worker configurations'
+        logger.info 'Waiting for server/worker configurations'
 
         @os_aws.configure_server_and_workers
       end
@@ -232,8 +236,9 @@ module OpenStudio
       end
 
       # Save a JSON with information about the cluster that was configured.
+      #
       # @param filename [String] Path and filename to save the JSON file
-      def save_cluster_json(filename)
+      def save_cluster_info(filename)
         File.open(filename, 'w') { |f| f << JSON.pretty_generate(cluster_info) }
       end
 
@@ -242,29 +247,71 @@ module OpenStudio
         @os_aws.describe_availability_zones
       end
 
-      # Stop the entire cluster
-      def stop
-        puts "Stoping any instance with group ID: #{@os_aws.group_uuid}"
+      # Delete the key pair. Make sure that this happens at the end of whatever you are running, because you
+      # will not be able to connect to the instance after you do this.
+      def delete_key_pair
+        @os_aws.delete_key_pair
+      end
 
-        stop_instances_by_group_id(@os_aws.group_uuid)
+      # Return the description of the instances in the GroupUUID
+      #
+      # @example Return Example
+      #   [{:instance_id=>"i-45f924ac",
+      #     :image_id=>"ami-845a54ec",
+      #     :state=>{:code=>48, :name=>"terminated"},
+      #     :private_dns_name=>"",
+      #     :public_dns_name=>"",
+      #     :state_transition_reason=>"User initiated (2015-06-01 21:50:40 GMT)",
+      #     :key_name=>"os-key-pair-275a3bf436004c04a1a347ff36337f16",
+      #     :ami_launch_index=>0,
+      #     :product_codes=>[],
+      #     :instance_type=>"m3.medium",
+      #     :launch_time=>2015-06-01 21:13:18 UTC,
+      #     :placement=>
+      #         {:availability_zone=>"us-east-1e", :group_name=>"", :tenancy=>"default"},
+      #         :monitoring=>{:state=>"disabled"},
+      #         :state_reason=>
+      #         {:code=>"Client.UserInitiatedShutdown",
+      #          :message=>"Client.UserInitiatedShutdown: User initiated shutdown"},
+      #         :architecture=>"x86_64",
+      #         :root_device_type=>"ebs",
+      #         :root_device_name=>"/dev/sda1",
+      #         :block_device_mappings=>[],
+      #         :virtualization_type=>"hvm",
+      #         :client_token=>"",
+      #         :tags=>
+      #         [{:key=>"Purpose", :value=>"OpenStudioServer"},
+      #          {:key=>"NumberOfProcessors", :value=>"1"},
+      #          {:key=>"GroupUUID", :value=>"275a3bf436004c04a1a347ff36337f16"},
+      #          {:key=>"Name", :value=>"OpenStudio-Server"},
+      #          {:key=>"UserID", :value=>"unknown_user"}],
+      #         :security_groups=>
+      #         [{:group_name=>"openstudio-server-sg-v2.1", :group_id=>"sg-8740f3ea"}],
+      #         :hypervisor=>"xen",
+      #         :network_interfaces=>[],
+      #         :ebs_optimized=>false}]
+      def describe_instances
+        @os_aws.describe_instances
       end
 
-      # openstudio_instance_type as symbol
-      def stop_instances(group_id, openstudio_instance_type)
-        instances = @os_aws.describe_running_instances(group_id, openstudio_instance_type.to_sym)
-        ids = instances.map { |k, _| k[:instance_id] }
+      # Return the list of all the instances that are running on the account in the availablity zone
+      def total_instances_count
+        @os_aws.total_instances_count
+      end
 
-        resp = []
-        resp = @os_aws.stop_instances(ids).to_hash unless ids.empty?
-        resp
+      # Return the estimated cost for EC2 instances
+      def estimated_charges
+        @os_cloudwatch.estimated_charges
       end
 
-      # Warning, it appears that this stops all the instances
-      def stop_instances_by_group_id(group_id)
-        instances = @os_aws.describe_running_instances(group_id)
+      # Stop running instances
+      #
+      # @param group_id [String] The unique group identifier for the OpenStudio cluster.
+      # @param openstudio_instance_type [Symbol] The type of instance (:server or :worker)
+      def stop_instances(group_id, openstudio_instance_type)
+        instances = @os_aws.describe_running_instances(group_id, openstudio_instance_type.to_sym)
         ids = instances.map { |k, _| k[:instance_id] }
 
-        puts "Stoping the following instances #{ids}"
         resp = []
         resp = @os_aws.stop_instances(ids).to_hash unless ids.empty?
         resp
@@ -272,26 +319,30 @@ module OpenStudio
 
       # @params(ids): array of instance ids
       def terminate_instances(ids)
-        puts "Terminating the following instances #{ids}"
+        logger.info "Terminating the following instances #{ids}"
         resp = []
         resp = @os_aws.terminate_instances(ids).to_hash unless ids.empty?
         resp
       end
 
-      # Warning, it appears that this terminates all the instances
+      # Warning, this appears that it terminates all the instances
       def terminate_instances_by_group_id(group_id)
+        fail "Group ID not defined" unless group_id
+
         instances = @os_aws.describe_running_instances(group_id)
+        logger.info instances
         ids = instances.map { |k, _| k[:instance_id] }
 
-        puts "Terminating the following instances #{ids}"
+        logger.info "Terminating the following instances #{ids}"
         resp = []
         resp = @os_aws.terminate_instances(ids).to_hash unless ids.empty?
+
         resp[:terminating_instances].first[:current_state][:name] == 'shutting-down'
       end
 
-      # Terminate the entire cluster
+      # Terminate the entire cluster based on the member variable's group_uuid.
       def terminate
-        puts "Terminating any instance with group ID: #{@os_aws.group_uuid}"
+        logger.info "Terminating any instance with GroupUUID: #{@os_aws.group_uuid}"
 
         terminate_instances_by_group_id(@os_aws.group_uuid)
       end
@@ -303,7 +354,7 @@ module OpenStudio
         if h[:location] == 'AWS'
           @os_aws.find_server(h)
         else
-          puts "Instance file '#{filename}' does not have the location of 'AWS'"
+          logger.info "Instance file '#{filename}' does not have the location of 'AWS'"
           return false
         end
 

data/lib/openstudio/aws/config.rb

@@ -1,57 +1,38 @@
 module OpenStudio
   module Aws
     class Config
-      include Logging
-
       attr_accessor :access_key
       attr_accessor :secret_key
 
       def initialize(yml_config_file = nil)
-        # If the AWS keys are set in the env variable and the yml_config_file is nil, then use those keys
-        @access_key = ENV['AWS_ACCESS_KEY_ID'] if ENV['AWS_ACCESS_KEY_ID']
-        @secret_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV['AWS_SECRET_ACCESS_KEY']
-
-        if @access_key && @secret_key && yml_config_file.nil?
-          logger.info 'Using AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY from environment variables'
-        else
-          # Otherwise read the file
-          logger.info 'Reading AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY from aws config file'
-
-          @yml_config_file = yml_config_file
-          @config = nil
-
-          @yml_config_file = File.join(File.expand_path('~'), 'aws_config.yml') if @yml_config_file.nil?
+        @yml_config_file = yml_config_file
+        @config = nil
 
+        if @yml_config_file.nil?
+          @yml_config_file = File.join(File.expand_path('~'), 'aws_config.yml')
           unless File.exist?(@yml_config_file)
             write_config_file
-            fail "Config file not found. A template has been added, please edit and save: #{@yml_config_file}"
+            fail "No Config File in user home directory. A template has been added, please edit and save: #{@yml_config_file}"
             exit 1
           end
+        end
 
-          begin
-            @config = YAML.load(File.read(@yml_config_file))
-
-            # always convert to symbolized hash
-            @config = @config.inject({}) { |a, (k, v)| a[k.to_sym] = v; a }
-
-            @access_key = @config[:access_key_id]
-            @secret_key = @config[:secret_access_key]
-          rescue
-            raise "Couldn't read config file #{@yml_config_file}. Delete file then recreate by rerunning script"
-          end
+        begin
+          @config = YAML.load(File.read(@yml_config_file))
+          @access_key = @config['access_key_id']
+          @secret_key = @config['secret_access_key']
+        rescue
+          raise "Couldn't read config file #{@yml_config_file}. Delete file then recreate by rerunning script"
         end
       end
 
       private
 
       def write_config_file
-        # create the file
-        data = {
-          access_key_id: 'YOUR_ACCESS_KEY_ID',
-          secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
-        }
-
-        File.open(@yml_config_file, 'w') { |f| f << data.to_yaml }
+        File.open(@yml_config_file, 'w') do |f|
+          f << "access_key_id: YOUR_ACCESS_KEY_ID\n"
+          f << "secret_access_key: YOUR_SECRET_ACCESS_KEY\n"
+        end
       end
     end
   end

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.3.2'
+    VERSION = '0.4.0.alpha1'
   end
 end

data/lib/openstudio/core_ext/hash.rb

@@ -0,0 +1,22 @@
+# From: https://github.com/rails/rails/blob/001b270611cd9cb653124775899bdbc2548333ab/activesupport/lib/active_support/core_ext/hash/except.rb
+class Hash
+  # Returns a hash that includes everything but the given keys.
+  #   hash = { a: true, b: false, c: nil}
+  #   hash.except(:c) # => { a: true, b: false}
+  #   hash # => { a: true, b: false, c: nil}
+  #
+  # This is useful for limiting a set of parameters to everything but a few known toggles:
+  #   @person.update(params[:person].except(:admin))
+  def except(*keys)
+    dup.except!(*keys)
+  end
+
+  # Replaces the hash without the given keys.
+  #   hash = { a: true, b: false, c: nil}
+  #   hash.except!(:c) # => { a: true, b: false}
+  #   hash # => { a: true, b: false }
+  def except!(*keys)
+    keys.each { |key| delete(key) }
+    self
+  end
+end

data/lib/openstudio/lib/ami_list.rb

@@ -21,6 +21,8 @@
 # Class for managing the AMI ids based on the openstudio version and the openstudio-server version
 
 class OpenStudioAmis
+  include Logging
+
   VALID_OPTIONS = [
     :openstudio_version, :openstudio_server_version, :host, :url, :stable
   ]
@@ -100,6 +102,7 @@ class OpenStudioAmis
     json[version]
   end
 
+  # Return the AMIs for the server and worker. Version 2 also does a lookup of the stable version
   def get_ami_version_2
     json = list
 
@@ -114,9 +117,29 @@ class OpenStudioAmis
     elsif @options[:openstudio_version] != 'default'
       if @options[:stable]
         stable = json[:openstudio][@options[:openstudio_version].to_sym][:stable]
-        fail "Could not find a stable version for openstudio version #{@options[:openstudio_version]}" unless stable
-        value = json[:openstudio][@options[:openstudio_version].to_sym][stable.to_sym]
-        amis = value[:amis]
+        if stable
+          value = json[:openstudio][@options[:openstudio_version].to_sym][stable.to_sym]
+          amis = value[:amis]
+        else
+          logger.info "Could not find a stable version for OpenStudio version #{@options[:openstudio_version]}. "\
+                      "Looking up older versions to find the latest stable." unless stable
+
+          json[:openstudio].each do |os_version, values|
+            next if os_version == :default
+            if values.key? :stable
+              # don't check versions newer than what we are requesting
+              next if os_version.to_s.to_version > @options[:openstudio_version].to_s.to_version
+              stable = json[:openstudio][os_version][:stable]
+              logger.info "Found a stable version for OpenStudio version #{os_version} with OpenStudio Server version #{stable}"
+              value = values[stable.to_sym]
+              amis = value[:amis]
+
+              break
+            end
+          end
+
+          fail "Could not find a stable version for openstudio version #{@options[:openstudio_version]}" unless amis
+        end
       else
         # return the default version (which is the latest)
         default = json[:openstudio][@options[:openstudio_version].to_sym][:default]
@@ -126,6 +149,8 @@ class OpenStudioAmis
       end
     end
 
+    logger.info "AMI IDs are #{amis}" if amis
+
     amis
   end
 
@@ -138,6 +163,7 @@ class OpenStudioAmis
 
     url = URI.parse(uri_str)
     req = Net::HTTP::Get.new(url.path)
+    logger.info "Fetching AMI list from #{uri_str}"
     response = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
     case response
       when Net::HTTPSuccess then

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -1,4 +1,3 @@
-# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files
 ######################################################################
 #  Copyright (c) 2008-2014, Alliance for Sustainable Energy.
 #  All rights reserved.
@@ -36,7 +35,7 @@ class OpenStudioAwsInstance
     @key_pair_name = key_pair_name
     @security_groups = security_groups
     @group_uuid = group_uuid.to_s
-    @init_timestamp = Time.now # This is the timestamp and is typically just tracked for the server
+    @init_timestamp = Time.now  # This is the timestamp and is typically just tracked for the server
     @private_key = private_key
     @private_key_file_name = private_key_file_name
     @proxy = proxy
@@ -141,12 +140,12 @@ class OpenStudioAwsInstance
       t = tag.split('=')
       if t.size != 2
         logger.error "Tag '#{t}' not defined or does not have an equal sign"
-        puts "Tag '#{t}' not defined or does not have an equal sign"
+        fail "Tag '#{t}' not defined or does not have an equal sign"
         next
       end
       if %w(Name GroupUUID NumberOfProcessors Purpose UserID).include? t[0]
         logger.error "Tag name '#{t[0]}' is a reserved tag"
-        puts "Tag name '#{t[0]}' is a reserved tag"
+        fail "Tag name '#{t[0]}' is a reserved tag"
         next
       end
 
@@ -162,7 +161,7 @@ class OpenStudioAwsInstance
         tags: aws_tags
       )
     rescue Aws::EC2::Errors::InvalidInstanceIDNotFound
-      sleep 1000
+      sleep 5
       retry unless (tries -= 1).zero?
     end
 
@@ -270,6 +269,8 @@ class OpenStudioAwsInstance
     processors = 1
     if lookup.key?(instance)
       processors = lookup[instance]
+    else
+      # logger.warn "Could not find the number of processors for instance type of #{instance}" if logger
     end
 
     if @openstudio_instance_type == :server
@@ -306,13 +307,13 @@ class OpenStudioAwsInstance
       # port 22 might not be available immediately after the instance finishes launching
       return if retries == 5
       retries += 1
-      sleep 1
+      sleep 2
       retry
     rescue
       # Unknown upload error, retry
       return if retries == 5
       retries += 1
-      sleep 1
+      sleep 2
       retry
     end
   end
@@ -342,11 +343,11 @@ class OpenStudioAwsInstance
   rescue Net::SSH::HostKeyMismatch => e
     e.remember_host!
     logger.info('key mismatch, retry')
-    sleep 1
+    sleep 2
     retry
   rescue SystemCallError, Timeout::Error => e
     # port 22 might not be available immediately after the instance finishes launching
-    sleep 1
+    sleep 2
     logger.info('SystemCallError, Waiting for SSH to become available')
     retry
   end
@@ -391,7 +392,7 @@ class OpenStudioAwsInstance
   rescue SystemCallError, Timeout::Error => e
     # port 22 might not be available immediately after the instance finishes launching
     sleep 10
-    logger.info('Timeout.  Perhaps there is a communication error to EC2?  Will try again in 10 seconds')
+    logger.info('Timeout.  Perhaps there is a communication error to EC2?  Will try again')
     retry
   end
 
@@ -405,12 +406,12 @@ class OpenStudioAwsInstance
       # port 22 might not be available immediately after the instance finishes launching
       return if retries == 5
       retries += 1
-      sleep 1
+      sleep 2
       retry
     rescue
       return if retries == 5
       retries += 1
-      sleep 1
+      sleep 2
       retry
     end
   end
@@ -420,7 +421,7 @@ class OpenStudioAwsInstance
   # store some of the data into a custom struct.  The instance is the full description.  The remaining fields are
   # just easier accessors to the data in the raw request except for procs which is a custom request.
   def create_struct(instance, procs)
-    instance_struct = Struct.new(:instance, :id, :ip, :dns, :procs, :availability_zone, :private_ip_address)
+    instance_struct = Struct.new(:instance, :id, :ip, :dns, :procs, :availability_zone, :private_ip_address, :launch_time)
     s = instance_struct.new(
       instance,
       instance[:instance_id],
@@ -428,7 +429,8 @@ class OpenStudioAwsInstance
       instance[:public_dns_name],
       procs,
       instance[:placement][:availability_zone],
-      instance[:private_ip_address]
+      instance[:private_ip_address],
+      instance[:launch_time]
     )
 
     # store some values into the member variables

data/lib/openstudio/lib/openstudio_aws_logger.rb

@@ -1,6 +1,5 @@
-# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files
 ######################################################################
-#  Copyright (c) 2008-2014, Alliance for Sustainable Energy.
+#  Copyright (c) 2008-2015, Alliance for Sustainable Energy.
 #  All rights reserved.
 #
 #  This library is free software; you can redistribute it and/or