openstudio-aws 0.5.0.rc3 → 0.5.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ce57260b6ee993709bf25f2c74d3fc63f10d89
-  data.tar.gz: 7d7aad718c864f0f8ab29ecada4bcf5310cd67ae
+  metadata.gz: 6a266e3edb100d0822c7432e75623fb8f21bc0c2
+  data.tar.gz: f4d1e1dd872e88c3424c8b16e00248cab9af21eb
 SHA512:
-  metadata.gz: f9ba8dbfc583a631aadaa16e61de11b33ca3e8a3790b50c9caf54c5b42ec6b1a0bd962ab3cd032398ca7199e6ee66f8e3d223f3f6c94a17bc466ad0f0aaac33b
-  data.tar.gz: c512024e2000ffa70d8366a2082828d60fcb5839fb35e89a8b27b785036bc6d1ce073e56538d057cc48b001e904d49ebd9344932f89db4ce1c5f1303deb46936
+  metadata.gz: 5910f932a1cc088a072a7b2fee90759852173aab863e63e1f3b17f70c759f5840fc5f24dc16b40f7464f032b321f5f444223311366e5bd1e23a441a68e273647
+  data.tar.gz: 64288b3595d1486c0b72430b0b37fdc4055ed80356b5e51c43c218eaf6f6244989390971ea2acee2772fdb0773769955414ae61cc6496101c6d327e39adb4450

data/lib/openstudio/aws/version.rb

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

data/lib/openstudio/lib/ami_list.rb

@@ -182,7 +182,7 @@ class OpenStudioAmis
     amis = nil
     if @options[:openstudio_version].to_sym == :default && @options[:openstudio_server_version].to_sym == :default
       # grab the most recent openstudio server version - this is not recommended
-      key, value = json[:builds].first
+      value = json[:builds].first
       amis = {}
       amis[:server] = value[:ami]
       amis[:worker] = value[:ami]

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -170,7 +170,7 @@ class OpenStudioAwsInstance
 
     # only asked for 1 instance, so therefore it should be the first
     begin
-      tries ||= 3
+      tries ||= 5
       aws_instance = result.data.instances.first
       @aws.create_tags(
         resources: [aws_instance.instance_id],

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -59,7 +59,7 @@ class OpenStudioAwsWrapper
     @region = options[:region] || 'unknown-region'
 
     # If the keys exist in the directory then load those, otherwise create new ones.
-    @work_dir = options[:save_directory] || '.'
+    @work_dir = File.expand_path options[:save_directory]
     if File.exist?(File.join(@work_dir, 'ec2_worker_key.pem')) && File.exist?(File.join(@work_dir, 'ec2_worker_key.pub'))
       logger.info "Worker keys already exist, loading from #{@work_dir}"
       load_worker_key(File.join(@work_dir, 'ec2_worker_key.pem'))
@@ -477,12 +477,12 @@ class OpenStudioAwsWrapper
     logger.info('Running the configuration script for the server.')
     @server.wait_command('sudo /home/ubuntu/server_provision.sh && echo "true"')
     logger.info('Downloading the swarm join command.')
-    swarm_file = File.join(@work_dir, 'worker_swarm_join.sh')
+    swarm_file = File.join(@save_directory, 'worker_swarm_join.sh')
     @server.download_file('/home/ubuntu/swarmjoin.sh', swarm_file)
     logger.info('Running the configuration script for the worker(s).')
     @workers.each { |worker| worker.wait_command('sudo /home/ubuntu/worker_provision.sh && echo "true"') }
     logger.info('Successfully re-sized storage devices for all nodes. Joining server nodes to the swarm.')
-    worker_join_cmd = "#{File.read('worker_swarm_join.sh').strip} && echo \"true\""
+    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. Starting the server cluster.')
     @server.shell_command('docker stack deploy --compose-file docker-compose.yml osserver-stack')

metadata

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