openstudio-aws 0.5.0.rc8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a141ce8d56b1e2d45276a4f1a8829d2c25affea
-  data.tar.gz: 9bc56fd172f5af82eaa08d06fdccb834313b2471
+  metadata.gz: 13f49425895636ecaf4f257d16b89e4efa28804a
+  data.tar.gz: d7e29b456413dd3bb09b6c2608fcf8eea998a025
 SHA512:
-  metadata.gz: 192d50ba829700d1aa038a81d8d7f7b06996a18d44b4e75f753f9056c291efb4f1785a64f93683e9c8061ded1f23363ec6ec167feb2a40bf22210b604652adba
-  data.tar.gz: 70d3f029c8765796434dfb0ed5808a7e65240d5050c8a5a5b178d051e2108f980256963a4b63615c4ab8457bca357376e6d4e92369580772dcf9d9c18d3b5dac
+  metadata.gz: 38fc83e9eb648bedd0abf099f1c6ca78e0b708424b4f1f3d033b08b70b0a9000590bda356ca56f73b649b26105a8beeb4eac07f0eb7f33bae324f266ade3b0a9
+  data.tar.gz: b5937079c74a4057e6b76b70255a0d0cea29aa2e92d9685c01d2f98c8361a3c1bc7db861640ad0fba10f24b0bcfe3ef0837c53c1e68946754674b3ba5966795a

data/lib/openstudio/aws/aws.rb

@@ -180,13 +180,18 @@ module OpenStudio
           @os_aws.save_private_key @save_directory
         end
 
+        user_data_file = @dockerized ? 'server_script.sh.docker.template' : 'server_script.sh.template'
+
         server_options = {
           user_id: options[:user_id],
           tags: options[:tags],
           subnet_id: options[:subnet_id],
-          associate_public_ip_address: options[:associate_public_ip_address]
+          associate_public_ip_address: options[:associate_public_ip_address],
+          user_data_file: user_data_file
         }
 
+        server_options[:availability_zone] = options[:availability_zone] if options[:availability_zone]
+
         # 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 @save_directory
@@ -228,13 +233,15 @@ module OpenStudio
         end
 
         fail "Can't create workers without a server instance running" if @os_aws.server.nil?
+        user_data_file = @dockerized ? 'worker_script.sh.docker.template' : 'worker_script.sh.template'
 
         unless number_of_instances == 0
           worker_options = {
             user_id: options[:user_id],
             tags: options[:tags],
             subnet_id: options[:subnet_id],
-            associate_public_ip_address: options[:associate_public_ip_address]
+            associate_public_ip_address: options[:associate_public_ip_address],
+            user_data_file: user_data_file
           }
 
           # if options[:ebs_volume_size]

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.5.0.rc8'
+    VERSION = '0.5.0'
   end
 end

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -283,6 +283,10 @@ class OpenStudioAwsInstance
       'i2.2xlarge' => 8,
       'i2.4xlarge' => 16,
       'i2.8xlarge' => 32,
+      'd2.xlarge' => 4,
+      'd2.2xlarge' => 8,
+      'd2.4xlarge' => 16,
+      'd2.8xlarge' => 36,
       'hs1.8xlarge' => 16
     }
 

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -383,12 +383,14 @@ class OpenStudioAwsWrapper
     defaults = {
       user_id: 'unknown_user',
       tags: [],
-      ebs_volume_size: nil
+      ebs_volume_size: nil,
+      user_data_file: 'server_script.sh.template'
     }
     launch_options = defaults.merge(launch_options)
 
     # replace the server_script.sh.template with the keys to add
-    user_data = File.read(File.expand_path(File.dirname(__FILE__)) + '/server_script.sh.template')
+
+    user_data = File.read(File.join(File.expand_path(File.dirname(__FILE__)), launch_options[:user_data_file]))
     user_data.gsub!(/SERVER_HOSTNAME/, 'openstudio.server')
     user_data.gsub!(/WORKER_PRIVATE_KEY_TEMPLATE/, worker_keys.private_key.gsub("\n", '\\n'))
     user_data.gsub!(/WORKER_PUBLIC_KEY_TEMPLATE/, worker_keys.ssh_public_key)
@@ -408,11 +410,12 @@ class OpenStudioAwsWrapper
       user_id: 'unknown_user',
       tags: [],
       ebs_volume_size: nil,
-      availability_zone: @server.data.availability_zone
+      availability_zone: @server.data.availability_zone,
+      user_data_file: 'worker_script.sh.template'
     }
     launch_options = defaults.merge(launch_options)
 
-    user_data = File.read(File.expand_path(File.dirname(__FILE__)) + '/worker_script.sh.template')
+    user_data = File.read(File.join(File.expand_path(File.dirname(__FILE__)), launch_options[:user_data_file]))
     user_data.gsub!(/SERVER_IP/, @server.data.private_ip_address)
     user_data.gsub!(/SERVER_HOSTNAME/, 'openstudio.server')
     user_data.gsub!(/WORKER_PUBLIC_KEY_TEMPLATE/, worker_keys.ssh_public_key)
@@ -474,25 +477,46 @@ class OpenStudioAwsWrapper
 
   # blocking method that executes required commands for creating and provisioning a docker swarm cluster
   def configure_swarm_cluster(save_directory)
+    logger.info('waiting for server user_data to complete')
+    @server.wait_command('while ! [ -e /home/ubuntu/user_data_done ]; do sleep 5; done && echo "true"')
     logger.info('Running the configuration script for the server.')
-    @server.wait_command('sudo /home/ubuntu/server_provision.sh && echo "true"')
+    @server.wait_command('echo $(env) &> /home/ubuntu/env.log && echo "true"')
+    @server.wait_command('cp /home/ubuntu/server_provision.sh /home/ubuntu/server_provision.sh.bak && echo "true"')
+    @server.wait_command('sudo /home/ubuntu/server_provision.sh &> /home/ubuntu/server_provision.log && echo "true"')
     logger.info('Downloading the swarm join command.')
     swarm_file = File.join(save_directory, 'worker_swarm_join.sh')
     @server.download_file('/home/ubuntu/swarmjoin.sh', swarm_file)
+    logger.info('waiting for worker user_data to complete')
+    @workers.each { |worker| worker.wait_command('while ! [ -e /home/ubuntu/user_data_done ]; do sleep 5; done && echo "true"') }
     logger.info('Running the configuration script for the worker(s).')
-    @workers.each { |worker| worker.wait_command('sudo /home/ubuntu/worker_provision.sh && echo "true"') }
+    @workers.each { |worker| worker.wait_command('sudo /home/ubuntu/worker_provision.sh &> /home/ubuntu/worker_provision.log && echo "true"') }
     logger.info('Successfully re-sized storage devices for all nodes. Joining server nodes to the swarm.')
     worker_join_cmd = "#{File.read(swarm_file).strip} && echo \"true\""
     @workers.each { |worker| worker.wait_command(worker_join_cmd) }
     logger.info('All worker nodes have been added to the swarm. Setting environment variables and starting the cluster')
     total_procs = @server.procs
     @workers.each { |worker| total_procs += worker.procs }
-    @server.shell_command("OS_SERVER_NUMBER_OF_WORKERS=#{total_procs} docker stack deploy --compose-file docker-compose.yml osserver-stack")
+    max_requests = ((total_procs + 10) * 1.2).round
+    mongo_cores = (total_procs / 64.0).ceil
+    web_cores = (total_procs / 32.0).ceil
+    max_pool = 16 * web_cores
+    rez_mem = 512 * max_pool
+    total_procs = total_procs - mongo_cores - web_cores + 2
+    @server.shell_command("echo 'MAX_REQUESTS=#{max_requests}' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo 'MONGO_CORES=#{mongo_cores}' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo 'WEB_CORES=#{web_cores}' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo 'MAX_POOL=#{max_pool}' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo 'REZ_MEM=#{rez_mem}M' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo 'OS_SERVER_NUMBER_OF_WORKERS=#{total_procs}' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("echo '' >> /home/ubuntu/.env && echo \"true\"")
+    @server.shell_command("docker stack deploy --compose-file docker-compose.yml osserver && echo \"true\"")
     sleep 10
     logger.info('The OpenStudio Server stack has been started. Waiting for the server to become available.')
     @server.wait_command("while ( nc -zv #{@server.ip} 80 3>&1 1>&2- 2>&3- ) | awk -F \":\" '$3 != \" Connection refused\" {exit 1}'; do sleep 5; done && echo \"true\"")
     logger.info('The OpenStudio Server stack has become available. Scaling the worker nodes.')
-    @server.wait_command("docker service scale osserver-stack_worker=#{total_procs} && echo \"true\"")
+    @server.wait_command("docker service scale osserver_worker=#{total_procs} && echo \"true\"")
+    logger.info('Waiting up to two minutes for the osserver_worker service to scale.')
+    @server.wait_command("timeout 120 bash -c -- 'while [ $( docker service ls -f name=osserver_worker --format=\"{{.Replicas}}\" ) != \"#{total_procs}/#{total_procs}\" ]; do sleep 5; done'; echo \"true\"")
     logger.info('The OpenStudio Server stack is booted and ready for analysis submissions.')
   end
 

data/lib/openstudio/lib/server_script.sh.docker.template

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# AWS Server Bootstrap File
+# This script is used to configure the AWS boxes for OpenStudio-server
+
+ENTRY="127.0.0.1 SERVER_HOSTNAME"
+FILE=/etc/hosts
+if grep -q "$ENTRY" $FILE; then
+  echo "Hosts '$SERVER_HOSTNAME' entry already exists"
+else
+  sudo sh -c "echo $ENTRY >> /etc/hosts"
+fi
+
+WORKER_PRIVATE_KEY="WORKER_PRIVATE_KEY_TEMPLATE"
+WORKER_PUBLIC_KEY="WORKER_PUBLIC_KEY_TEMPLATE"
+
+USER=ubuntu
+
+mkdir -p /home/$USER/.ssh && chmod 700 /home/$USER/.ssh
+echo -e $WORKER_PRIVATE_KEY > /home/$USER/.ssh/id_rsa
+echo -e $WORKER_PUBLIC_KEY > /home/$USER/.ssh/id_rsa.pub
+chmod 600 /home/$USER/.ssh/id_rsa
+chmod 644 /home/$USER/.ssh/id_rsa.pub
+chown ubuntu.ubuntu /home/$USER/.ssh/id_rsa
+chown ubuntu.ubuntu /home/$USER/.ssh/id_rsa.pub
+
+# Only allow localhost (and localhosts IP) to connect ot itself with this key. The IP is used for R cluster
+ENTRY="from=\"localhost,127.0.0.1\" $WORKER_PUBLIC_KEY"
+FILE=/home/$USER/.ssh/authorized_keys
+if grep -q "$ENTRY" $FILE; then
+  echo "Key already exists in file"
+else
+  echo $ENTRY >> $FILE
+fi
+chmod 644 /home/$USER/.ssh/authorized_keys
+
+# SSH config
+echo -e "Host *\n\tStrictHostKeyChecking no" > /home/$USER/.ssh/config
+chmod 644 /home/$USER/.ssh/config && chown ubuntu.ubuntu /home/$USER/.ssh/config
+
+# ec2 instance information
+curl -o /usr/local/bin/ec2-metadata http://s3.amazonaws.com/ec2metadata/ec2-metadata
+chmod 775 /usr/local/bin/ec2-metadata
+mkdir -p /etc/openstudio-server
+ec2-metadata -a -i -t -h -o -z -p -v > /etc/openstudio-server/instance.yml
+
+#file flag the user_data has completed
+cat /dev/null > /home/ubuntu/user_data_done

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

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# AWS Worker Bootstrap File
+# File used to configure worker nodes on AWS
+
+# Change Host File Entries
+ENTRY="SERVER_IP SERVER_HOSTNAME"
+FILE=/etc/hosts
+if grep -q "$ENTRY" $FILE; then
+  echo "entry already exists"
+else
+  sh -c "echo $ENTRY >> $FILE"
+fi
+
+WORKER_PUBLIC_KEY="WORKER_PUBLIC_KEY_TEMPLATE"
+
+# add the public key to authorized keys
+USER=ubuntu
+
+mkdir -p /home/$USER/.ssh && chmod 700 /home/$USER/.ssh
+
+# Only access from the server node
+ENTRY="from=\"SERVER_HOSTNAME\" $WORKER_PUBLIC_KEY"
+FILE=/home/$USER/.ssh/authorized_keys
+if grep -q "$ENTRY" $FILE; then
+  echo "Key already exists in file"
+else
+  echo $ENTRY >> $FILE
+fi
+chmod 644 /home/$USER/.ssh/authorized_keys
+
+# ec2 instance information
+curl -o /usr/local/bin/ec2-metadata http://s3.amazonaws.com/ec2metadata/ec2-metadata
+chmod 775 /usr/local/bin/ec2-metadata
+mkdir -p /etc/openstudio-server
+ec2-metadata -a -i -t -h -o -z -p -v > /etc/openstudio-server/instance.yml
+
+#file flag the user_data has completed
+cat /dev/null > /home/ubuntu/user_data_done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc8
+  version: 0.5.0
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -123,7 +123,9 @@ files:
 - lib/openstudio/lib/openstudio_aws_logger.rb
 - lib/openstudio/lib/openstudio_aws_wrapper.rb
 - lib/openstudio/lib/openstudio_cloud_watch.rb
+- lib/openstudio/lib/server_script.sh.docker.template
 - lib/openstudio/lib/server_script.sh.template
+- lib/openstudio/lib/worker_script.sh.docker.template
 - lib/openstudio/lib/worker_script.sh.template
 - openstudio-aws.gemspec
 - spec/aws_instances/aws_spec_api.rb