lib/routes/main.rb in gaptool-server-0.4.10 vs lib/routes/main.rb in gaptool-server-0.4.11

@@ -32,10 +32,11 @@
     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
     data.merge!("secret" => @secret)
-    sgid = gt_securitygroup(data['role'], data['environment'], data['zone'])
+    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)
     if data['mirror']
       instance = @ec2.instances.create(
         :image_id => image_id,
         :availability_zone => data['zone'],