openstudio-aws 0.5.0.pre.rc10 → 0.5.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6c544860e89bb1aa21c31c2a1080e39e4c05f1
-  data.tar.gz: 0ccece11b3414a692798053a86405b4911a39968
+  metadata.gz: f25ae1f2fffef1ff271532785c98876ca3537a49
+  data.tar.gz: 33d4ffb87da5ec343c439792f2c92313860ee44c
 SHA512:
-  metadata.gz: 456278c94c96aef2e226cef7d942ce085e6108a7e798a676ba87c94102069e8b36fcf0bd0771fa3760c9292f658588a6aa069df38495a7d2882fdb05c04631c5
-  data.tar.gz: d4ab0350dfb8bcc640b0d8cb959493292678436f424bef60130d0c997ef4d854b7764892fcd28236b0bf88b6d71129a45696e14f1a1b78f4f5a64386aa49cbd5
+  metadata.gz: 5372a36a082bf5a83462debb6773cfaa3d2acba5a53e22125278a8b7144141f90b3bc977386c437761435743489d62dd2eead6a603e33c613674606579735449
+  data.tar.gz: f1f2769a3ef6d21d5722a543a572e73088ae8638c205fb1574fed894bf862ba1635365aa277176daa88708c87f5563eba7691a395d9ad92773d09ad3831d0ec8

data/lib/openstudio/aws/aws.rb

@@ -162,8 +162,8 @@ module OpenStudio
         end
 
         if options[:security_groups].empty?
-          # if the user has not specified any security groups, then create one called: 'openstudio-server-sg-v2'
-          @os_aws.create_or_retrieve_default_security_group(tmp_name = 'openstudio-server-sg-v2.2',
+          # if the user has not specified any security groups, then create one called: 'openstudio-server-sg-v1'
+          @os_aws.create_or_retrieve_default_security_group(tmp_name = 'openstudio-server-sg-v2.1',
                                                             vpc_id=options[:vpc_id])
         else
           @os_aws.security_groups = options[:security_groups]
@@ -180,18 +180,13 @@ 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],
-          user_data_file: user_data_file
+          associate_public_ip_address: options[:associate_public_ip_address]
         }
 
-        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
@@ -233,15 +228,13 @@ 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],
-            user_data_file: user_data_file
+            associate_public_ip_address: options[:associate_public_ip_address]
           }
 
           # if options[:ebs_volume_size]
@@ -253,15 +246,8 @@ module OpenStudio
 
         logger.info 'Waiting for server/worker configurations'
 
-        begin
-          if @dockerized
-            @os_aws.configure_swarm_cluster(@save_directory)
-          else
-            @os_aws.configure_server_and_workers
-          end
-        rescue => e
-          fail "Configuring the cluster failed with error `#{e.message}` in:\n#{e.backtrace.join('\n')}"
-        end
+        return @os_aws.configure_server_and_workers unless @dockerized
+        @os_aws.configure_swarm_cluster if @dockerized
       end
 
       # Write out to the terminal the connection information for the servers and workers

data/lib/openstudio/aws/version.rb

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

data/lib/openstudio/lib/ami_list.rb

@@ -179,24 +179,20 @@ class OpenStudioAmis
   # Return the required docker AMI base box
   def get_ami_version_3
     json = list
-    amis = nil
+    amis = {}
     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
-      value = json[:builds].first
-      amis = {}
+      key, value = json[:openstudio_server].first
       amis[:server] = value[:ami]
       amis[:worker] = value[:ami]
     elsif @options[:openstudio_server_version] != 'default'
-      hash_array = json[:builds]
-      hash = hash_array.select { |hash| hash[:name] == @options[:openstudio_server_version] }
-      fail "Multiple | no entries found matching name key `#{@options[:openstudio_server_version]}`" unless hash.length == 1
-      amis = {}
-      amis[:server] = hash.first[:ami]
-      amis[:worker] = hash.first[:ami]
+      value = json[:openstudio_server][@options[:openstudio_server_version].to_sym]
+      amis[:server] = value[:ami]
+      amis[:worker] = value[:ami]
     elsif @options[:openstudio_version] != 'default'
       fail 'Currently the openstudio_version lookup is not supported in v3.'
     end
-    fail 'The requested AMI key is NULL.' if amis[:server] == nil
+
     logger.info "AMI IDs are #{amis}" if amis
 
     amis

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 ||= 5
+      tries ||= 3
       aws_instance = result.data.instances.first
       @aws.create_tags(
         resources: [aws_instance.instance_id],
@@ -283,10 +283,6 @@ 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

@@ -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 = File.expand_path options[:save_directory]
+    @work_dir = 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'))
@@ -81,7 +81,7 @@ class OpenStudioAwsWrapper
     @aws = Aws::EC2::Client.new(options[:credentials])
   end
 
-  def create_or_retrieve_default_security_group(tmp_name = 'openstudio-server-sg-v2.2', vpc_id = nil)
+  def create_or_retrieve_default_security_group(tmp_name = 'openstudio-server-sg-v2.1', vpc_id = nil)
     group = @aws.describe_security_groups(filters: [{ name: 'group-name', values: [tmp_name] }])
     logger.info "Length of the security group is: #{group.data.security_groups.length}"
     if group.data.security_groups.length == 0
@@ -94,13 +94,13 @@ class OpenStudioAwsWrapper
       end
       group_id = r[:group_id]
       @aws.authorize_security_group_ingress(
+        group_name: tmp_name,
         group_id: group_id,
         ip_permissions: [
           { ip_protocol: 'tcp', from_port: 22, to_port: 22, ip_ranges: [cidr_ip: '0.0.0.0/0'] }, # Eventually make this only the user's IP address seen by the internet
           { ip_protocol: 'tcp', from_port: 80, to_port: 80, ip_ranges: [cidr_ip: '0.0.0.0/0'] },
           { ip_protocol: 'tcp', from_port: 443, to_port: 443, ip_ranges: [cidr_ip: '0.0.0.0/0'] },
           { ip_protocol: 'tcp', from_port: 0, to_port: 65535, user_id_group_pairs: [{ group_name: tmp_name }] }, # allow all machines in the security group talk to each other openly
-          { ip_protocol: 'udp', from_port: 0, to_port: 65535, user_id_group_pairs: [{ group_name: tmp_name }] }, # allow all machines in the security group talk to each other openly
           { ip_protocol: 'icmp', from_port: -1, to_port: -1, ip_ranges: [cidr_ip: '0.0.0.0/0'] }
         ]
       )
@@ -383,14 +383,12 @@ class OpenStudioAwsWrapper
     defaults = {
       user_id: 'unknown_user',
       tags: [],
-      ebs_volume_size: nil,
-      user_data_file: 'server_script.sh.template'
+      ebs_volume_size: nil
     }
     launch_options = defaults.merge(launch_options)
 
     # replace the server_script.sh.template with the keys to add
-
-    user_data = File.read(File.join(File.expand_path(File.dirname(__FILE__)), launch_options[:user_data_file]))
+    user_data = File.read(File.expand_path(File.dirname(__FILE__)) + '/server_script.sh.template')
     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)
@@ -410,12 +408,11 @@ class OpenStudioAwsWrapper
       user_id: 'unknown_user',
       tags: [],
       ebs_volume_size: nil,
-      availability_zone: @server.data.availability_zone,
-      user_data_file: 'worker_script.sh.template'
+      availability_zone: @server.data.availability_zone
     }
     launch_options = defaults.merge(launch_options)
 
-    user_data = File.read(File.join(File.expand_path(File.dirname(__FILE__)), launch_options[:user_data_file]))
+    user_data = File.read(File.expand_path(File.dirname(__FILE__)) + '/worker_script.sh.template')
     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)
@@ -476,48 +473,25 @@ class OpenStudioAwsWrapper
   end
 
   # 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"')
+  def configure_swarm_cluster
     logger.info('Running the configuration script for the server.')
-    @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"')
+    @server.wait_command('sudo /home/ubuntu/server_provision.sh && echo "true"')
     logger.info('Downloading the swarm join command.')
-    swarm_file = File.join(save_directory, 'worker_swarm_join.sh')
+    swarm_file = File.join(@work_dir, '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 &> /home/ubuntu/worker_provision.log && echo "true"') }
+    @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(swarm_file).strip} && echo \"true\""
+    worker_join_cmd = "#{File.read('worker_swarm_join.sh').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')
+    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.')
     total_procs = @server.procs
     @workers.each { |worker| total_procs += worker.procs }
-    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_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.')
+    @server.wait_command("docker service scale osserver-stack_worker=#{total_procs} && echo \"true\"")
+    logger.info('The OpenStudio Server stack has been configured.')
   end
 
   # method to query the amazon api to find the server (if it exists), based on the group id

data/spec/openstudio-aws/ami_list_spec.rb

@@ -14,11 +14,12 @@ describe OpenStudioAmis do
     end
 
     it 'should return specific amis if passed a version' do
-      a = OpenStudioAmis.new(1, openstudio_version: '1.13.2')
+      a = OpenStudioAmis.new(1, openstudio_version: '1.2.1')
       amis = a.get_amis
 
-      expect(amis[:server]).to eq('ami-e7a1bbf0')
-      expect(amis[:worker]).to eq('ami-e0a1bbf7')
+      expect(amis[:server]).to eq('ami-89744be0')
+      expect(amis[:worker]).to eq('ami-37744b5e')
+      expect(amis[:cc2worker]).to eq('ami-51744b38')
     end
 
     it 'should list all amis' do
@@ -29,11 +30,66 @@ describe OpenStudioAmis do
   end
 
   context 'version 2' do
+    it 'should return openstudio server version 1.8.0 correctly' do
+      a = OpenStudioAmis.new(2, openstudio_server_version: '1.8.0')
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-3c0fbf54')
+      expect(amis[:worker]).to eq('ami-040ebe6c')
+      expect(amis[:cc2worker]).to eq('ami-040ebe6c')
+    end
+  end
+
+  context 'version 2' do
+    it 'should return openstudio version 1.7.1 when stable is passed to 1.7.5' do
+      a = OpenStudioAmis.new(2, openstudio_version: '1.7.5', stable: true)
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-845a54ec')
+      expect(amis[:worker]).to eq('ami-3a5a5452')
+    end
+
+    it 'should return openstudio version 1.7.1 stable & default versions correctly' do
+      a = OpenStudioAmis.new(2, openstudio_version: '1.7.1')
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-845a54ec')
+      expect(amis[:worker]).to eq('ami-3a5a5452')
+    end
+
+    it 'should return openstudio version 1.7.0 default version correctly' do
+      a = OpenStudioAmis.new(2, openstudio_version: '1.7.0')
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-725b701a')
+      expect(amis[:worker]).to eq('ami-4a446f22')
+    end
+
+    it 'should return openstudio version 1.7.0 stable version correctly' do
+      a = OpenStudioAmis.new(2, openstudio_version: '1.7.0', stable: true)
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-c06b40a8')
+      expect(amis[:worker]).to eq('ami-9a97bff2')
+    end
 
     it 'should fail when trying to find a stable version for older releases' do
       a = OpenStudioAmis.new(2, openstudio_version: '1.5.0', stable: true)
 
       expect { a.get_amis }.to raise_error(/Could not find a stable version for openstudio version 1.5.0/)
     end
+
+    it 'should return latest version when passing in a future version' do
+      a = OpenStudioAmis.new(2, openstudio_version: '4.8.15', stable: true)
+
+      a = a.get_amis
+
+      expect(a).not_to be nil
+    end
   end
 end

data/spec/openstudio-aws/aws_spec.rb

@@ -25,6 +25,17 @@ describe OpenStudio::Aws::Aws do
 
       expect(aws.default_amis).not_to be_nil
     end
+
+    it 'should find the cc2 instances' do
+      options = {
+        ami_lookup_version: 2,
+        openstudio_server_version: '1.5.0'
+      }
+      aws = OpenStudio::Aws::Aws.new(options)
+
+      expect(aws.determine_image_type('cc2.2xlarge')).to eq 'ami-e582948c'
+      expect(aws.determine_image_type('c3.2xlarge')).to eq 'ami-918294f8'
+    end
   end
 
   context 'should error' do
@@ -38,14 +49,14 @@ describe OpenStudio::Aws::Aws do
   end
 
   context 'version testing' do
-    it 'version 2: should find the right AMIs Server 1.21.15' do
+    it 'version 2: should find the right AMIs Server 1.3.1' do
       options = {
         ami_lookup_version: 2,
-        openstudio_server_version: '1.21.15'
+        openstudio_server_version: '1.3.1'
       }
       aws = OpenStudio::Aws::Aws.new(options)
-      expect(aws.default_amis[:worker]).to eq('ami-ccb35ada')
-      expect(aws.default_amis[:server]).to eq('ami-54b45d42')
+      expect(aws.default_amis[:worker]).to eq('ami-39bb8750')
+      expect(aws.default_amis[:server]).to eq('ami-a9bb87c0')
     end
   end
 

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -73,9 +73,9 @@ describe OpenStudioAwsWrapper do
     context 'version 2' do
       it 'should create a new json' do
         resp = @aws.os_aws.create_new_ami_json(2)
-        expect(resp[:openstudio_server]['1.21.4'.to_sym][:amis][:server]).to eq('ami-e7a1bbf0')
-        expect(resp[:openstudio_server]['1.21.4'.to_sym][:openstudio_version_sha]).to eq('6103d54380')
-        expect(resp[:openstudio_server]['1.21.4'.to_sym][:tested]).to eq(false)
+        expect(resp[:openstudio_server]['1.8.0'.to_sym][:amis][:server]).to eq('ami-3c0fbf54')
+        expect(resp[:openstudio_server]['1.3.1'.to_sym][:openstudio_version_sha]).to eq('7a955d780b')
+        expect(resp[:openstudio_server]['1.3.5'.to_sym][:tested]).to eq(false)
       end
     end
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.rc10
+  version: 0.5.0.rc0
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -56,42 +56,42 @@ dependencies:
   name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
 description: Custom classes for configuring clusters for OpenStudio & EnergyPlus analyses
@@ -101,10 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .gitmodules
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - License.txt
@@ -123,9 +123,7 @@ 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
@@ -146,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Start AWS EC2 instances for running distributed OpenStudio-based analyses

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

@@ -1,48 +0,0 @@
-#!/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

@@ -1,39 +0,0 @@
-#!/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