gaptool-server 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067dafa0686058c80cdb4fab0b92d67aa70ab5f0
-  data.tar.gz: af93d9d318e739e5ce4f956f254f16fca0f6c8bd
+  metadata.gz: 779152ed4d55a3bb346e7107396f5dbac79908a3
+  data.tar.gz: 5bcd127b0645eacd8f6b9efd268c1eb9398a4406
 SHA512:
-  metadata.gz: 6bd63413dc9427a5e7d49c8bc66b97fefbb946d6a686f5eab88519df4ee3771951432dd31bf386721086ac0260394730059248c07b0e742c6c8ae8704c26592d
-  data.tar.gz: 055972c09d036073f911242999b4df433d4a704bf342ab10f2c28b0eac19dfcad5e3b863723b2e558acc69d0517268bc08110118793969c4ae2aaa54e419b0db
+  metadata.gz: d10a701d3409f90a0985fc793542f85f019fe6ceb1f830ebb03836a6fbedb481782290b5c9275000f2538b3389b41d1b8684d1800aad503ae17aeb350449b955
+  data.tar.gz: ed8136909200594bb0b2f8251e8cfc43c0c9d0bc21474ed7ba3e423a9c5a17b154072208efaf9c9b7181bd5cb5b0251febd049941878f86c51cb2746fbfa8bcb

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/routes/main.rb

@@ -11,7 +11,9 @@ class GaptoolServer < Sinatra::Application
 
   post '/init' do
     data = JSON.parse request.body.read
-    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{data['zone'].chop}.amazonaws.com")
+    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'),
+               :secret_access_key => $redis.hget('config', 'aws_secret'),
+               :ec2_endpoint => "ec2.#{data['zone'].chop}.amazonaws.com")
     @ec2 = AWS::EC2.new
     # create shared secret to reference in /register
     @secret = (0...8).map{65.+(rand(26)).chr}.join
@@ -19,36 +21,14 @@ class GaptoolServer < Sinatra::Application
     security_group = data['security_group'] || $redis.hget("role:#{data['role']}", "security_group")
     sgid = gt_securitygroup(data['role'], data['environment'], data['zone'], security_group)
     image_id = data['ami'] || $redis.hget("amis:#{data['role']}", data['zone'].chop) || $redis.hget("amis", data['zone'].chop)
-    puts data['zone']
-    if data['mirror']
-      instance = @ec2.instances.create(
-        :image_id => image_id,
-        :availability_zone => data['zone'],
-        :instance_type => data['itype'],
-        :key_name => "gaptool",
-        :security_group_ids => sgid,
-        :user_data => "#!/bin/bash\ncurl --silent -H 'X-GAPTOOL-USER: #{env['HTTP_X_GAPTOOL_USER']}' -H 'X-GAPTOOL-KEY: #{env['HTTP_X_GAPTOOL_KEY']}' #{$redis.hget('config', 'url')}/register -X PUT --data '#{data.to_json}' | bash",
-        :block_device_mappings => {
-          "/dev/sdf" => {
-            :volume_size => data['mirror'].to_i,
-            :delete_on_termination => false
-          },
-          "/dev/sdg" => {
-            :volume_size => data['mirror'].to_i,
-            :delete_on_termination => false
-          }
-        }
-      )
-    else
-      instance = @ec2.instances.create(
-        :image_id => image_id,
-        :availability_zone => data['zone'],
-        :instance_type => data['itype'],
-        :key_name => "gaptool",
-        :security_group_ids => sgid,
-        :user_data => "#!/bin/bash\ncurl --silent -H 'X-GAPTOOL-USER: #{env['HTTP_X_GAPTOOL_USER']}' -H 'X-GAPTOOL-KEY: #{env['HTTP_X_GAPTOOL_KEY']}' #{$redis.hget('config', 'url')}/register -X PUT --data '#{data.to_json}' | bash"
-      )
-    end
+    instance = @ec2.instances.create(
+      :image_id => image_id,
+      :availability_zone => data['zone'],
+      :instance_type => data['itype'],
+      :key_name => "gaptool",
+      :security_group_ids => sgid,
+      :user_data => "#!/bin/bash\ncurl --silent -H 'X-GAPTOOL-USER: #{env['HTTP_X_GAPTOOL_USER']}' -H 'X-GAPTOOL-KEY: #{env['HTTP_X_GAPTOOL_KEY']}' #{$redis.hget('config', 'url')}/register -X PUT --data '#{data.to_json}' | bash"
+    )
     # Add host tag
     instance.add_tag('Name', :value => "#{data['role']}-#{data['environment']}-#{instance.id}")
     instance.add_tag('gaptool', :value => "yes")
@@ -64,7 +44,9 @@ class GaptoolServer < Sinatra::Application
 
   post '/terminate' do
     data = JSON.parse request.body.read
-    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{data['zone']}.amazonaws.com")
+    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'),
+               :secret_access_key => $redis.hget('config', 'aws_secret'),
+               :ec2_endpoint => "ec2.#{data['zone']}.amazonaws.com")
     @ec2 = AWS::EC2.new
     @instance = @ec2.instances[data['id']]
     res = @instance.terminate
@@ -75,7 +57,9 @@ class GaptoolServer < Sinatra::Application
 
   put '/register' do
     data = JSON.parse request.body.read
-    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{data['zone'].chop}.amazonaws.com")
+    AWS.config(:access_key_id => $redis.hget('config', 'aws_id'),
+               :secret_access_key => $redis.hget('config', 'aws_secret'),
+               :ec2_endpoint => "ec2.#{data['zone'].chop}.amazonaws.com")
     @ec2 = AWS::EC2.new
     host_key = "instance:#{data['role']}:#{data['environment']}:#{data['secret']}"
     host_data = $redis.hgetall(host_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Matt Bailey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra