fix ownership-change permission check

[arvados.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index d483b3b1ff38857f8cb6bc54697845a6fe7ab8f6..2333d80544607cfe015fcdd7023aac123b2a2127 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,4 +1,4 @@
-class Node < ActiveRecord::Base
+class Node < OrvosModel
   include AssignUuid
   include KindAndEtag
   include CommonApiTemplate
@@ -16,12 +16,7 @@ class Node < ActiveRecord::Base
                 nil
               end
   @@domain = Rails.configuration.compute_node_domain rescue `hostname --domain`.strip
-  @@nameservers = begin
-                    Rails.configuration.compute_node_nameservers
-                  rescue
-                    [Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/local-ipv4')).
-                     match(/^[\d\.]+$/)[0]]
-                  end
+  @@nameservers = Rails.configuration.compute_node_nameservers
 
   api_accessible :superuser, :extend => :common do |t|
     t.add :hostname
@@ -74,7 +69,10 @@ class Node < ActiveRecord::Base
     end
 
     # Record instance ID if not already known
-    self.info[:ec2_instance_id] ||= o[:ec2_instance_id]
+    if !self.info[:ec2_instance_id] and o[:ec2_instance_id]
+      self.info[:ec2_instance_id] = o[:ec2_instance_id]
+      `ec2-create-tags #{self.info[:ec2_instance_id]} --tag 'Name=#{self.uuid}'`
+    end
 
     # Assign hostname
     if self.slot_number.nil?
@@ -90,6 +88,9 @@ class Node < ActiveRecord::Base
         raise "No available node slots" if try_slot == MAX_SLOTS
       end while true
       self.hostname = self.class.hostname_for_slot(self.slot_number)
+      if info[:ec2_instance_id]
+        `ec2-create-tags #{self.info[:ec2_instance_id]} --tag 'hostname=#{self.hostname}'`
+      end
     end
 
     save
@@ -100,7 +101,8 @@ class Node < ActiveRecord::Base
     cmd = ["ec2-run-instances",
            "--user-data '#{ping_url}'",
            "-t c1.xlarge -n 1 -g orvos-compute",
-           "ami-68ca6901"
+           "--client-token", self.uuid,
+           Rails.configuration.compute_node_ami
           ].join(' ')
     self.info[:ec2_start_command] = cmd
     logger.info "#{self.uuid} ec2_start_command= #{cmd.inspect}"
@@ -108,7 +110,9 @@ class Node < ActiveRecord::Base
     self.info[:ec2_start_result] = result
     logger.info "#{self.uuid} ec2_start_result= #{result.inspect}"
     result.match(/INSTANCE\s*(i-[0-9a-f]+)/) do |m|
-      self.info[:ec2_instance_id] = m[1]
+      instance_id = m[1]
+      self.info[:ec2_instance_id] = instance_id
+      `ec2-create-tags #{instance_id} --tag 'Name=#{self.uuid}'`
     end
     self.save!
   end