openstudio-aws 0.5.0.rc0 → 0.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25ae1f2fffef1ff271532785c98876ca3537a49
-  data.tar.gz: 33d4ffb87da5ec343c439792f2c92313860ee44c
+  metadata.gz: 08ed2838c540e0945bf7f3e5d43acecad8ec5d59
+  data.tar.gz: 40b2b50ee9ed04c29c30b56ee45e2268947d0891
 SHA512:
-  metadata.gz: 5372a36a082bf5a83462debb6773cfaa3d2acba5a53e22125278a8b7144141f90b3bc977386c437761435743489d62dd2eead6a603e33c613674606579735449
-  data.tar.gz: f1f2769a3ef6d21d5722a543a572e73088ae8638c205fb1574fed894bf862ba1635365aa277176daa88708c87f5563eba7691a395d9ad92773d09ad3831d0ec8
+  metadata.gz: d0bd7fe21356210a0b765dd010169fdcb8acdd6024e0887191078f122f0cd8d6f955d3d64cdfa05cbd59480335e75ad5481806e85b6aadb66e6c1ad8fb269a8a
+  data.tar.gz: 23fae6dd410cd52926e1574cdba13bda5def8c7c593623e32ccd698eba0f6741065f527d6e057d5169e303e0475ae8f0b973578db040f075d08dbc4d2a6e1f65

data/lib/openstudio/aws/version.rb

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

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -487,11 +487,13 @@ class OpenStudioAwsWrapper
     logger.info('All worker nodes have been added to the swarm. Starting the server cluster.')
     @server.shell_command('docker stack deploy --compose-file docker-compose.yml osserver-stack')
     sleep 10
-    logger.info('The OpenStudio Server stack has been started. Scaling worker nodes.')
+    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.')
     total_procs = @server.procs
     @workers.each { |worker| total_procs += worker.procs }
     @server.wait_command("docker service scale osserver-stack_worker=#{total_procs} && echo \"true\"")
-    logger.info('The OpenStudio Server stack has been configured.')
+    logger.info('The OpenStudio Server stack is booted and ready for analysis submissions.')
   end
 
   # method to query the amazon api to find the server (if it exists), based on the group id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc0
+  version: 0.5.0.rc1
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp