openstudio-aws 0.1.26 → 0.2.0

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -48,17 +48,20 @@ class OpenStudioAwsWrapper
   attr_reader :workers
   attr_reader :proxy
 
-  # todo: put this into a module
-  VALID_OPTIONS = [
-    :proxy, :credentials
-  ]
+  attr_accessor :private_key_file_name
+
+  VALID_OPTIONS = [:proxy, :credentials]
 
   def initialize(options = {}, group_uuid = nil)
-    @group_uuid = group_uuid || Time.now.to_i.to_s
+    @group_uuid = group_uuid || (SecureRandom.uuid).gsub('-', '')
 
     @security_group_name = nil
     @key_pair_name = nil
-    @private_key = nil
+    @private_key_file_name = nil
+
+    @private_key = nil # Private key data
+
+    # List of instances
     @server = nil
     @workers = []
 
@@ -66,7 +69,7 @@ class OpenStudioAwsWrapper
     @proxy = options[:proxy] ? options[:proxy] : nil
 
     # need to remove the prxoy information here
-    @aws = Aws::EC2.new(options[:credentials])
+    @aws = Aws::EC2::Client.new(options[:credentials])
   end
 
   def create_or_retrieve_security_group(sg_name = nil)
@@ -77,21 +80,17 @@ class OpenStudioAwsWrapper
       logger.info 'server group not found --- will create a new one'
       @aws.create_security_group(group_name: tmp_name, description: "group dynamically created by #{__FILE__}")
       @aws.authorize_security_group_ingress(
-
-              group_name: tmp_name,
-              ip_permissions: [
-                { ip_protocol: 'tcp', from_port: 1, to_port: 65535, ip_ranges: [cidr_ip: '0.0.0.0/0'] }
-              ]
-
+          group_name: tmp_name,
+          ip_permissions: [
+            { ip_protocol: 'tcp', from_port: 1, to_port: 65_535, ip_ranges: [cidr_ip: '0.0.0.0/0'] }
+          ]
       )
       @aws.authorize_security_group_ingress(
-
-              group_name: tmp_name,
-              ip_permissions: [
-                { ip_protocol: 'icmp', from_port: -1, to_port: -1, ip_ranges: [cidr_ip: '0.0.0.0/0']
-                }
-              ]
-
+          group_name: tmp_name,
+          ip_permissions: [
+            { ip_protocol: 'icmp', from_port: -1, to_port: -1, ip_ranges: [cidr_ip: '0.0.0.0/0']
+            }
+          ]
       )
 
       # reload group information
@@ -131,34 +130,40 @@ class OpenStudioAwsWrapper
     resp = nil
     if group_uuid
       resp = @aws.describe_instances(
-
-              filters: [
-                { name: 'instance-state-code', values: [0.to_s, 16.to_s] }, # running or pending
-                { name: 'tag-key', values: ['GroupUUID'] },
-                { name: 'tag-value', values: [group_uuid.to_s] } # todo: how to check for the server versions
-              # {:name => "tag-value", :values => [group_uuid.to_s, "OpenStudio#{@openstudio_instance_type.capitalize}"]}
-              # {:name => "tag:key=value", :values => ["GroupUUID=#{group_uuid.to_s}"]}
-              ]
-
+          filters: [
+            { name: 'instance-state-code', values: [0.to_s, 16.to_s] }, # running or pending
+            { name: 'tag-key', values: ['GroupUUID'] },
+            { name: 'tag-value', values: [group_uuid.to_s] }
+          ]
       )
     else
-      # todo: need to restrict this to only the current user
       resp = @aws.describe_instances
     end
 
     instance_data = nil
     if resp
-      if resp.reservations.length > 0
-        resp = resp.reservations.first
-        if resp.instances
-          instance_data = []
-          resp.instances.each do |i|
-            instance_data << i.to_hash
+      instance_data = []
+      resp.reservations.each do |r|
+        r.instances.each do |i|
+          i_h = i.to_hash
+          if group_uuid && openstudio_instance_type
+            # {:key=>"Purpose", :value=>"OpenStudioWorker"}
+            if i_h[:tags].any? { |h| (h[:key] == 'Purpose') && (h[:value] == "OpenStudio#{openstudio_instance_type.capitalize}") } &&
+                      i_h[:tags].any? { |h|(h[:key] == 'GroupUUID') && (h[:value] == group_uuid.to_s) }
+              instance_data << i_h
+            end
+          elsif group_uuid
+            if i_h[:tags].any? { |h|(h[:key] == 'GroupUUID') && (h[:value] == group_uuid.to_s) }
+              instance_data << i_h
+            end
+          elsif openstudio_instance_type
+            if i_h[:tags].any? { |h| (h[:key] == 'Purpose') && (h[:value] == "OpenStudio#{openstudio_instance_type.capitalize}") }
+              instance_data << i_h
+            end
+          else
+            instance_data << i_h
           end
-
         end
-      else
-        logger.info 'no running instances found'
       end
     end
 
@@ -201,7 +206,29 @@ class OpenStudioAwsWrapper
     resp
   end
 
-  def create_or_retrieve_key_pair(key_pair_name = nil, private_key_file = nil)
+  def stop_instances(ids)
+    resp = @aws.stop_instances(
+        instance_ids: ids,
+        force: true
+    )
+
+    resp
+  end
+
+  def terminate_instances(ids)
+    begin
+      resp = @aws.terminate_instances(
+          instance_ids: ids,
+      )
+    rescue Aws::EC2::Errors::InvalidInstanceIDNotFound
+      # Log that the instances couldn't be found?
+      return resp = {error: 'instances could not be found'}
+    end
+      
+    resp
+  end
+
+  def create_or_retrieve_key_pair(key_pair_name = nil)
     tmp_name = key_pair_name || "os-key-pair-#{@group_uuid}"
 
     # the describe_key_pairs method will raise an expection if it can't find the keypair, so catch it
@@ -226,23 +253,25 @@ class OpenStudioAwsWrapper
       logger.info "found existing keypair #{resp.key_pairs.first}"
       @key_pair_name = resp.key_pairs.first[:key_name]
 
-      if File.exists(private_key_file)
-        @private_key = File.read(private_key_file, 'r')
-      else
-        # should we raise?
-        logger.error "Could not find the private key file to load from #{private_key_file}"
-      end
+      # This will not set the private key because it doesn't live on the remote system
     end
 
     logger.info("create key pair: #{@key_pair_name}")
   end
 
+  def load_private_key(filename)
+    fail "Could not find private key #{filename}" unless File.exist? filename
+    @private_key_file_name = File.expand_path filename
+    @private_key = File.read(filename)
+  end
+
   def save_private_key(filename)
     if @private_key
+      @private_key_file_name = File.expand_path filename
       File.open(filename, 'w') { |f| f << @private_key }
       File.chmod(0600, filename)
     else
-      logger.error 'no private key found in which to persist'
+      fail "No private key found in which to persist with filename #{filename}"
     end
   end
 
@@ -251,11 +280,13 @@ class OpenStudioAwsWrapper
     options = defaults.merge(options)
 
     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, @proxy)
+    @server = OpenStudioAwsInstance.new(@aws, :server, @key_pair_name, @security_group_name, @group_uuid, @private_key, @private_key_file_name, @proxy)
+
+    # create the EBS volumes instead of the ephemeral storage - needed especially for the m3 instances (SSD)
 
     fail 'image_id is nil' unless image_id
     fail 'instance type is nil' unless instance_type
-    @server.launch_instance(image_id, instance_type, user_data, options[:user_id])
+    @server.launch_instance(image_id, instance_type, user_data, options[:user_id], options[:ebs_volume_size])
   end
 
   def launch_workers(image_id, instance_type, num, options = {})
@@ -271,13 +302,14 @@ class OpenStudioAwsWrapper
     # thread the launching of the workers
 
     num.times do
-      @workers << OpenStudioAwsInstance.new(@aws, :worker, @key_pair_name, @security_group_name, @group_uuid, @private_key, @proxy)
+      @workers << OpenStudioAwsInstance.new(@aws, :worker, @key_pair_name, @security_group_name, @group_uuid, @private_key, @private_key_file_name, @proxy)
     end
 
     threads = []
     @workers.each do |worker|
       threads << Thread.new do
-        worker.launch_instance(image_id, instance_type, user_data, options[:user_id])
+        # create the EBS volumes instead of the ephemeral storage - needed especially for the m3 instances (SSD)
+        worker.launch_instance(image_id, instance_type, user_data, options[:user_id], options[:ebs_volume_size])
       end
     end
     threads.each { |t| t.join }
@@ -289,45 +321,45 @@ class OpenStudioAwsWrapper
   # blocking method that waits for servers and workers to be fully configured (i.e. execution of user_data has
   # occured on all nodes)
   def configure_server_and_workers
-    # todo: add a timeout here!
     logger.info('waiting for server user_data to complete')
-    @server.wait_command(@server.data.ip, '[ -e /home/ubuntu/user_data_done ] && echo "true"')
-    @logger.info('waiting for worker user_data to complete')
-    @workers.each { |worker| worker.wait_command(worker.data.ip, '[ -e /home/ubuntu/user_data_done ] && echo "true"') }
+    @server.wait_command('[ -e /home/ubuntu/user_data_done ] && echo "true"')
+    logger.info('waiting for worker user_data to complete')
+    @workers.each { |worker| worker.wait_command('[ -e /home/ubuntu/user_data_done ] && echo "true"') }
 
     ips = "master|#{@server.data.ip}|#{@server.data.dns}|#{@server.data.procs}|ubuntu|ubuntu|true\n"
     @workers.each { |worker| ips << "worker|#{worker.data.ip}|#{worker.data.dns}|#{worker.data.procs}|ubuntu|ubuntu|true\n" }
     file = Tempfile.new('ip_addresses')
     file.write(ips)
     file.close
-    @server.upload_file(@server.data.ip, file.path, 'ip_addresses')
+    @server.upload_file(file.path, 'ip_addresses')
     file.unlink
     logger.info("ips #{ips}")
-    @server.shell_command(@server.data.ip, 'chmod 664 /home/ubuntu/ip_addresses')
-    @server.shell_command(@server.data.ip, '~/setup-ssh-keys.sh')
-    @server.shell_command(@server.data.ip, '~/setup-ssh-worker-nodes.sh ip_addresses')
+    @server.shell_command('chmod 664 /home/ubuntu/ip_addresses')
+    @server.shell_command('~/setup-ssh-keys.sh')
+    @server.shell_command('~/setup-ssh-worker-nodes.sh ip_addresses')
 
     mongoid = File.read(File.expand_path(File.dirname(__FILE__)) + '/mongoid.yml.template')
     mongoid.gsub!(/SERVER_IP/, @server.data.ip)
     file = Tempfile.new('mongoid.yml')
     file.write(mongoid)
     file.close
-    @server.upload_file(@server.data.ip, file.path, '/mnt/openstudio/rails-models/mongoid.yml')
-    @workers.each { |worker| worker.upload_file(worker.data.ip, file.path, '/mnt/openstudio/rails-models/mongoid.yml') }
+    @server.upload_file(file.path, '/mnt/openstudio/rails-models/mongoid.yml')
+    @workers.each { |worker| worker.upload_file(file.path, '/mnt/openstudio/rails-models/mongoid.yml') }
     file.unlink
 
-    # Does this command crash it?
-    @server.shell_command(@server.data.ip, 'chmod 664 /mnt/openstudio/rails-models/mongoid.yml')
-    @workers.each { |worker| worker.shell_command(worker.data.ip, 'chmod 664 /mnt/openstudio/rails-models/mongoid.yml') }
+    @server.shell_command('chmod 664 /mnt/openstudio/rails-models/mongoid.yml')
+    @workers.each { |worker| worker.shell_command('chmod 664 /mnt/openstudio/rails-models/mongoid.yml') }
 
+    sleep 60 # wait 60 more seconds for everything -- this is cheesy
     true
   end
 
   # method to query the amazon api to find the server (if it exists), based on the group id
   # if it is found, then it will set the @server member variable.
   # Note that the information around keys and security groups is pulled from the instance information.
-  def find_server(group_uuid = nil)
-    group_uuid = group_uuid || @group_uuid
+  def find_server(server_data_hash)
+    group_uuid = server_data_hash[:group_id] || @group_uuid
+    load_private_key(server_data_hash[:server][:private_key_file_name])
 
     logger.info "finding the server for groupid of #{group_uuid}"
     fail 'no group uuid defined either in member variable or method argument' if group_uuid.nil?
@@ -338,7 +370,7 @@ class OpenStudioAwsWrapper
       resp = resp.first
       if !@server
         logger.info "Server found and loading data into object [instance id is #{resp[:instance_id]}]"
-        @server = OpenStudioAwsInstance.new(@aws, :server, resp[:key_name], resp[:security_groups].first[:group_name], group_uuid, @private_key)
+        @server = OpenStudioAwsInstance.new(@aws, :server, resp[:key_name], resp[:security_groups].first[:group_name], group_uuid, @private_key, @private_key_file_name)
         @server.load_instance_data(resp)
       else
         logger.info "Server instance is already defined with instance #{resp[:instance_id]}"
@@ -346,6 +378,9 @@ class OpenStudioAwsWrapper
     else
       fail 'could not find a running server instance'
     end
+
+    # Really don't need to return anything because this sets the class instance variable
+    @server
   end
 
   # method to hit the existing list of available amis and compare to the list of AMIs on Amazon and then generate the
@@ -393,14 +428,15 @@ class OpenStudioAwsWrapper
 
   def to_os_worker_hash
     worker_hash = []
-    @workers.each { |worker|
+    @workers.each do |worker|
       worker_hash.push(
-                           id: worker.data.id,
-                           ip: 'http://' + worker.data.ip,
-                           dns: worker.data.dns,
-                           procs: worker.data.procs
-                       )
-    }
+          id: worker.data.id,
+          ip: "http://#{worker.data.ip}",
+          dns: worker.data.dns,
+          procs: worker.data.procs,
+          private_key_file_name: worker.private_key_file_name
+      )
+    end
 
     out = { workers: worker_hash }
     logger.info out
@@ -515,7 +551,7 @@ class OpenStudioAwsWrapper
     end
 
     # sort the openstudio server version
-    amis[:openstudio_server] = Hash[amis[:openstudio_server].sort_by { |k, v| v[:openstudio_server_version].to_version }.reverse]
+    amis[:openstudio_server] = Hash[amis[:openstudio_server].sort_by { |_k, v| v[:openstudio_server_version].to_version }.reverse]
 
     # now sort the openstudio section & determine the defaults
     amis[:openstudio].keys.each do |key|

data/lib/openstudio/lib/os-aws.rb

@@ -84,7 +84,7 @@ end
 Aws.config = { access_key_id: ARGV[0], secret_access_key: ARGV[1], region: ARGV[2], ssl_verify_peer: false }
 
 if ARGV[3] == 'EC2'
-  @aws = Aws::EC2.new
+  @aws = Aws::EC2::Client.new
 elsif ARGV[3] == 'CloudWatch'
   @aws = AWS::CloudWatch.new
 else
@@ -166,7 +166,7 @@ begin
       @server_instance_type = @params['instance_type']
       begin
         os_aws.launch_server(@server_image_id, @server_instance_type)
-      rescue Exception => e
+      rescue => e
         error(-1, "Server status: #{e.message}")
       end
 
@@ -180,6 +180,7 @@ begin
 
       # find the private key in the users home directory, or crash
       if File.exist?(SERVER_PEM_FILENAME)
+        # TODO: this will no longer work.  need to refactor this file to be more like the OpenSTudio analysis spreadsheet
         os_aws.create_or_retrieve_key_pair(nil, SERVER_PEM_FILENAME)
       else
         fail "Could not find previous private key which should be here: #{SERVER_PEM_FILENAME}"
@@ -196,7 +197,7 @@ begin
       begin
         # this will launch and configure with threads inside os_aws
         os_aws.launch_workers(@worker_image_id, @worker_instance_type, @params['num'])
-      rescue Exception => e
+      rescue => e
         error(-1, "Server status: #{e.message}")
       end
 
@@ -263,7 +264,14 @@ begin
     when 'estimated_charges'
       endTime = Time.now.utc
       startTime = endTime - 86_400
-      resp = @aws.client.get_metric_statistics(dimensions: [{ name: 'ServiceName', value: 'AmazonEC2' }, { name: 'Currency', value: 'USD' }], metric_name: 'EstimatedCharges', namespace: 'AWS/Billing', start_time: startTime.iso8601, end_time: endTime.iso8601, period: 300, statistics: ['Maximum'])
+      resp = @aws.client.get_metric_statistics(dimensions: [{ name: 'ServiceName', value: 'AmazonEC2' },
+                                                            { name: 'Currency', value: 'USD' }],
+                                               metric_name: 'EstimatedCharges',
+                                               namespace: 'AWS/Billing',
+                                               start_time: startTime.iso8601,
+                                               end_time: endTime.iso8601,
+                                               period: 300,
+                                               statistics: ['Maximum'])
       error(-1, 'No Billing Data') if resp.data[:datapoints].length == 0
       datapoints = resp.data[:datapoints]
       datapoints.sort! { |a, b| a[:timestamp] <=> b[:timestamp] }
@@ -273,9 +281,9 @@ begin
     else
       error(-1, "Unknown command: #{ARGV[4]} (#{ARGV[3]})")
   end
-    # puts \"Status: #{resp.http_response.status}\"
+# puts \"Status: #{resp.http_response.status}\"
 rescue SystemExit => e
-rescue Exception => e
+rescue => e
   if e.message == 'getaddrinfo: No such host is known. '
     error(503, 'Offline')
   elsif defined? e.http_response

data/lib/openstudio/lib/server_script.sh

@@ -11,9 +11,12 @@ FILE=/etc/hosts
 if grep -q "$ENTRY" $FILE; then
   echo "entry already exists"
 else
-  sudo sh -c "echo $ENTRY >> /etc/hosts"
+  sh -c "echo $ENTRY >> /etc/hosts"
 fi
 
+rm -rf /mnt
+mkdir /mnt
+
 # copy all the setup scripts to the appropriate home directory
 # the scripts are called by the AWS connector for passwordless ssh config
 cp /data/launch-instance/setup* /home/ubuntu/
@@ -21,55 +24,66 @@ chmod 775 /home/ubuntu/setup*
 chown ubuntu:ubuntu /home/ubuntu/setup*
 
 # stop the various services that use mongo
-sudo service delayed_job stop
-sudo service apache2 stop
-sudo service mongodb stop
+service delayed_job stop
+service apache2 stop
+service mongodb stop
 
 # remove mongo db & add it back
-sudo mkdir -p /mnt/mongodb/data
-sudo chown mongodb:nogroup /mnt/mongodb/data
-sudo rm -rf /var/lib/mongodb
+mkdir -p /mnt/mongodb/data
+chown mongodb:nogroup /mnt/mongodb/data
+rm -rf /var/lib/mongodb
 
 # restart mongo
-sudo service mongodb start
+service mongodb start
 # delay the continuation because mongo is a forked process and when it initializes
 # it has to create the preallocated journal files (takes ~ 90 seconds on a slower system)
 sleep 2m
 
 # restart the rails application
-sudo service apache2 stop
-sudo service apache2 start
+service apache2 stop
+service apache2 start
 
 # Add in the database indexes after making the db directory
-sudo chmod 777 /var/www/rails/openstudio/public
-cd /var/www/rails/openstudio
-rake db:purge
-rake db:mongoid:create_indexes
+chmod 777 /var/www/rails/openstudio/public
+su - ubuntu -c 'cd /var/www/rails/openstudio && bundle exec rake db:purge'
+su - ubuntu -c 'cd /var/www/rails/openstudio && bundle exec rake db:mongoid:create_indexes'
+
+## Worker Data Configuration -- On Vagrant this is a separate file
 
-## Worker Data Configuration
 # Force the generation of various directories that are in the EBS mnt
-sudo rm -rf /mnt/openstudio
-sudo mkdir -p /mnt/openstudio
-sudo chown -R ubuntu:www-data /mnt/openstudio
-sudo chmod -R 775 /mnt/openstudio
+rm -rf /mnt/openstudio
+mkdir -p /mnt/openstudio
+chown -R ubuntu:www-data /mnt/openstudio
+chmod -R 775 /mnt/openstudio
 
 # save application files into the right directory
 cp -rf /data/worker-nodes/* /mnt/openstudio/
 
+# install workflow dependencies
+su - ubuntu -c 'cd /mnt/openstudio && rm -f'
+rm -f /mnt/openstudio/Gemfile.lock
+cd /mnt/openstudio && bundle update
+su - ubuntu -c 'cd /mnt/openstudio && bundle update'
+
 # copy over the models needed for mongo
-cd /mnt/openstudio/rails-models && unzip -o rails-models.zip
+cd /mnt/openstudio/rails-models && unzip -o rails-models.zip -d models
 
 # rerun the permissions after unzipping the files
-sudo chown -R ubuntu:www-data /mnt/openstudio
-sudo find /mnt/openstudio -type d -print0 | xargs -0 chmod 775
-sudo find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
-## End of Worker Data Configuration
+chown -R ubuntu:www-data /mnt/openstudio
+find /mnt/openstudio -type d -print0 | xargs -0 chmod 775
+find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
+
+## End Worker Data Configuration
 
 # restart rserve
-sudo service Rserve restart
+service Rserve restart
 
 # restart delayed jobs
-sudo service delayed_job start
+service delayed_job start
+
+# Delay 1 minutes to make sure everything had tme to start.
+# This is a hack, sorry.
+sleep 1m
 
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done

data/lib/openstudio/lib/worker_script.sh.template

@@ -10,7 +10,7 @@ FILE=/etc/hosts
 if grep -q "$ENTRY" $FILE; then
   echo "entry already exists"
 else
-  sudo sh -c "echo $ENTRY >> /etc/hosts"
+  sh -c "echo $ENTRY >> /etc/hosts"
 fi
 
 # copy all the setup scripts to the appropriate home directory
@@ -18,31 +18,41 @@ cp /data/launch-instance/setup* /home/ubuntu/
 chmod 775 /home/ubuntu/setup*
 chown ubuntu:ubuntu /home/ubuntu/setup*
 
-## Worker Data Configuration
+## Worker Data Configuration -- On Vagrant this is a separate file
+
 # Force the generation of various directories that are in the EBS mnt
-sudo rm -rf /mnt/openstudio
-sudo mkdir -p /mnt/openstudio
-sudo chown -R ubuntu:www-data /mnt/openstudio
-sudo chmod -R 775 /mnt/openstudio
+rm -rf /mnt/openstudio
+mkdir -p /mnt/openstudio
+chown -R ubuntu:www-data /mnt/openstudio
+chmod -R 775 /mnt/openstudio
 
 # save application files into the right directory
 cp -rf /data/worker-nodes/* /mnt/openstudio/
 
+# install workflow dependencies
+su - ubuntu -c 'cd /mnt/openstudio && rm -f'
+rm -f /mnt/openstudio/Gemfile.lock
+cd /mnt/openstudio && bundle update
+su - ubuntu -c 'cd /mnt/openstudio && bundle update'
+
 # copy over the models needed for mongo
-cd /mnt/openstudio/rails-models && unzip -o rails-models.zip
+cd /mnt/openstudio/rails-models && unzip -o rails-models.zip -d models
 
 # rerun the permissions after unzipping the files
-sudo chown -R ubuntu:www-data /mnt/openstudio
-sudo find /mnt/openstudio -type d -print0 | xargs -0 chmod 775
-sudo find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
-## End of Worker Data Configuration
+chown -R ubuntu:www-data /mnt/openstudio
+find /mnt/openstudio -type d -print0 | xargs -0 chmod 775
+find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
+
+## End Worker Data Configuration
 
 #turn off hyperthreading
-for cpunum in $(
-  cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list | 
-  cut -s -d, -f2- | tr ',' '\n' | sort -un); do
-    echo 0 > /sys/devices/system/cpu/cpu$cpunum/online
-done
+# NL: do not turn off hyperthreading, rather, just limit the number of cores and see if it
+# makes a difference.
+#for cpunum in $(
+#  cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list |
+#  cut -s -d, -f2- | tr ',' '\n' | sort -un); do
+#    echo 0 > /sys/devices/system/cpu/cpu$cpunum/online
+#done
 
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done

data/lib/openstudio-aws.rb

@@ -3,6 +3,7 @@ require 'net/scp'
 require 'net/http'
 require 'yaml'
 require 'logger'
+require 'securerandom'
 require 'semantic'
 require 'semantic/core_ext'
 
@@ -15,6 +16,7 @@ rescue LoadError
   exit
 end
 
+require 'openstudio/lib/openstudio_aws_logger'
 require 'openstudio/aws/aws'
 require 'openstudio/aws/config'
 require 'openstudio/aws/version'