gaptool-server 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e37952b1aeb9e6097c6d75597c4d067a106c56
-  data.tar.gz: 1bb992a5df32f095dbc787b2487632f42e76b61b
+  metadata.gz: 5b30390596dc01948c60152b9bfcedac64c6a7a2
+  data.tar.gz: 1047f8c1a78239b180e0dfa82b09b32ff10553b0
 SHA512:
-  metadata.gz: b54978df0beef6e699879fa440d5e6cee9d7305dae09c4d28ac30261eff6bd9ab5c2847ddb6783560955e8dc2d17f64b0ee75d77219b9f7df556c3c4c0913adc
-  data.tar.gz: 634b1e0923a771b73afda77449390e0c4eebbe0a4fa7d026070f8546c7250acfce81bb9beb6914a66b006fcebafab31ed081e2790f8d2428834fbe136be6ccb7
+  metadata.gz: e1348e1db97048015c9f916787891ab1411378aeab0693e5c0c1f2c5583c329b888150b56f97dd57861e1b7481e2b3f9a232e791bb84e74eec102364023add97
+  data.tar.gz: 1f50122385dad3fcd3d2f0dc66efddb795c3f23661bbd68a6fd44933c35254b54f938fc276bd851ef176b30eac341f7070c21265c52ed24f37e8aff3052cd5df

data/lib/routes/main.rb

@@ -18,7 +18,8 @@ class GaptoolServer < Sinatra::Application
     data.merge!("secret" => @secret)
     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 = $redis.hget("amis:#{data['role']}", data['zone'].chop) || $redis.hget("amis", data['zone'].chop)
+    image_id = data['ami'].chop || $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,
@@ -52,7 +53,12 @@ class GaptoolServer < Sinatra::Application
     instance.add_tag('Name', :value => "#{data['role']}-#{data['environment']}-#{instance.id}")
     instance.add_tag('gaptool', :value => "yes")
     # Create temporary redis entry for /register to pull the instance id
-    $redis.set("instance:#{data['role']}:#{data['environment']}:#{@secret}", instance.id)
+    # with an expire of 24h
+    host_key = "instance:#{data['role']}:#{data['environment']}:#{@secret}"
+    $redis.hmset(host_key, 'instance_id', instance.id,
+                 'chef_branch', data['chef_branch'],
+                 'chef_repo', data['chef_repo'])
+    $redis.expire(host_key, 86400)
     "{\"instance\":\"#{instance.id}\"}"
   end
 
@@ -71,9 +77,14 @@ class GaptoolServer < Sinatra::Application
     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")
     @ec2 = AWS::EC2.new
-    @instance = @ec2.instances[$redis.get("instance:#{data['role']}:#{data['environment']}:#{data['secret']}")]
+    host_key = "instance:#{data['role']}:#{data['environment']}:#{data['secret']}"
+    host_data = redis.hgetall(host_key)
+    unless host_data
+        error 403
+    end
+    @instance = @ec2.instances[host_data['instance']]
     hostname = @instance.dns_name
-    $redis.del("instance:#{data['role']}:#{data['environment']}:#{data['secret']}")
+    $redis.del(host_key)
     @apps = []
     $redis.keys("app:*").each do |app|
       if $redis.hget(app, 'role') == data['role']
@@ -85,6 +96,10 @@ class GaptoolServer < Sinatra::Application
     data.merge!("apps" => @apps.to_json)
     data.merge!("instance" => @instance.id)
     hash2redis("host:#{data['role']}:#{data['environment']}:#{@instance.id}", data)
+
+    @chef_repo = data['chef_repo'] || $redis.hget('config', 'chefrepo')
+    @chef_branch = data['chef_branch'] || $redis.hget('config', 'chefbranch')
+    @initkey = $redis.hget('config', 'initkey')
     @json = {
       'hostname' => hostname,
       'recipe' => 'init',
@@ -92,12 +107,13 @@ class GaptoolServer < Sinatra::Application
       'run_list' => ['recipe[init]'],
       'role' => data['role'],
       'environment' => data['environment'],
-      'chefrepo' => $redis.hget('config', 'chefrepo'),
-      'chefbranch' => $redis.hget('config', 'chefbranch'),
+      'chefrepo' => @chef_repo,
+      'chefbranch' => @chef_branch,
       'identity' => $redis.hget('config','initkey'),
       'appuser' => $redis.hget('config','appuser'),
       'apps' => @apps
     }.to_json
+
     erb :init
   end
 

data/lib/views/init.erb

@@ -2,10 +2,11 @@ apt-get update
 apt-get install -ymq zsh git libssl-dev ruby1.9.1-full build-essential
 gem install --bindir /usr/local/bin --no-ri --no-rdoc chef
 cat << 'EOFKEY' > /root/.ssh/id_rsa
-<%=$redis.hget('config', 'initkey')%>
+<%= @initkey %>
 EOFKEY
 chmod 600 /root/.ssh/id_rsa
 echo 'StrictHostKeyChecking no' > /root/.ssh/config
-git clone -b <%=$redis.hget('config', 'chefbranch')%> <%=$redis.hget('config', 'chefrepo')%> /root/ops
-echo '<%=@json%>' > /root/init.json
-chef-solo -c /root/ops/cookbooks/init.rb -j /root/init.json && (rm /root/.ssh/id_rsa; userdel -r ubuntu; rm -rf /root/.ssh; rm -rf /root/ops; rm -rf /root/init.json)
+git clone -b <%= @chef_branch %> <%= @chef_repo %> /root/ops
+echo '<%= @json %>' > /root/init.json
+chef-solo -c /root/ops/cookbooks/init.rb -j /root/init.json && \
+    (rm /root/.ssh/id_rsa; userdel -r ubuntu; rm -rf /root/.ssh; rm -rf /root/ops)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Bailey