cloudboot 0.0.0 → 0.1.0

data/bin/cloudboot

@@ -23,15 +23,19 @@ opts = OptionParser.new do |opts|
     options[:action] = :cronjob
   end
 
-  opts.on("--list-instances", "Show a list of instances") do
-    options[:action] = :list_instances
+  opts.on("--list", "Show a list of instances") do
+    options[:action] = :list
+  end
+
+  opts.on("--hosts", "Update the /etc/hosts file") do
+    options[:action] = :hosts
   end
   
-  opts.on("-s", "--server", "Generates a server skeleton") do |name|
+  opts.on("--server", "Generates a server skeleton") do |name|
     options[:action] = :server
   end
 
-  opts.on("-c", "--client", "Generates a client skeleton") do |name|
+  opts.on("--client", "Generates a client skeleton") do |name|
     options[:action] = :client
   end
 
@@ -92,7 +96,7 @@ module Cloudboot
             f.puts(cfg.to_yaml)
           end
           
-        when :list_instances
+        when :list
           require 'activerecord'
           ActiveRecord::Base.establish_connection(config["database"])
           
@@ -103,6 +107,25 @@ module Cloudboot
         when :userdata
           puts config["server"].to_yaml
 
+        when :hosts
+          hosts = File.read("/etc/hosts")
+          
+          require 'activerecord'
+          ActiveRecord::Base.establish_connection(config["database"])
+
+          entries = Domain.find_by_name(config["server"]["domain"]).instances.collect{|instance| "#{instance.public_ip} #{instance.fqdn} #{instance.name}" }
+          
+          # remove any existing entries
+          hosts = hosts.gsub(/#cloudboot-default-start(.*)#cloudboot-default-end/m, "")
+
+          hosts << "#cloudboot-default-start\n"
+          hosts << entries.join("\n")
+          hosts << "\n#cloudboot-default-end"
+          
+          File.open("/etc/hosts", "w") do |f|
+            f.puts(hosts)
+          end
+
         when :server
           File.open("cloudboot-server.rb", "w") do |f|
             f.puts Cloudboot::Generator.server_script(config)

data/lib/cloudboot/domain.rb

@@ -6,10 +6,11 @@ module Cloudboot
   class Domain < ActiveRecord::Base
     has_many :instances, :class_name => "Cloudboot::Instance"
   
-    def self.ensure(name, instance_prefix, num)
+    def self.ensure(name, instance_prefix, num, refresh_timeout)
       ActiveRecord::Base.transaction do
 
         domain = find_or_create_by_name(name) do |d|
+          d.refresh_timeout = refresh_timeout
           d.instance_prefix = instance_prefix
         end
       
@@ -30,7 +31,7 @@ module Cloudboot
       
       end
     end
-  
+    
     def self.register(domainname, hostname, public_ip, private_ip)
     
       puts "registering:"
@@ -41,15 +42,48 @@ module Cloudboot
     
       domain = find_by_name(domainname)
       raise "unknown domain: #{domainname}" unless domain
-    
-      instance = domain.instances.find_by_name_and_public_ip_and_private_ip(hostname, public_ip, private_ip)
+
+      instance = domain.instances.find_by_name(hostname)
 
       now = DateTime.now
-    
+      
+      if instance
+        puts "found existing hostname #{hostname} in domain #{domainname}"
+        reset = false
+        
+        if instance.refresh > now - domain.refresh_timeout.seconds && instance.refresh != instance.created_at
+          
+          puts "refresh within #{domain.refresh_timeout} seconds - maybe conflict"
+          
+          if instance.public_ip != public_ip  
+            puts "public_ip is different - reset"
+            instance = nil
+          else                                
+            puts "public_ip is the same"
+          end
+
+          if instance
+            if instance.private_ip != private_ip  
+              puts "private_ip is different - reset"
+              instance = nil
+            else
+              puts "private_ip is the same"
+            end
+          end
+          
+        else
+          puts "no refresh since #{domain.refresh_timeout} seconds"
+        end
+      else
+        puts "no existing hostname #{hostname} in domain #{domainname}"
+      end
+      
+      # instance = domain.instances.find_by_name_and_public_ip_and_private_ip(hostname, public_ip, private_ip)
+
       unless instance
-        instance = domain.instances.find(:first, :conditions => ["refresh < ? or refresh = created_at", now - 60.seconds], :order => "name asc")
+        instance = domain.instances.find(:first, :conditions => ["refresh < ? or refresh = created_at", now - domain.refresh_timeout.seconds], :order => "name asc")
       end
-    
+
       raise "no available instance in domain: #{domainname}" unless instance
 
       ActiveRecord::Base.transaction do
@@ -58,7 +92,9 @@ module Cloudboot
         instance.refresh      = now
         instance.save
       end
-    
+      
+      puts "hostname #{hostname} -> hostname #{instance.name}"
+      
       instance
     end
   

data/lib/cloudboot/generator.rb

@@ -64,7 +64,7 @@ ActiveRecord::Base.establish_connection({
 
 Cloudboot::Generator.setup_tables
 
-Cloudboot::Domain.ensure("#{server["domain"]}", "srv", 3)
+Cloudboot::Domain.ensure("#{server["domain"]}", "srv", 3, 120)
 
 set :server, ["webrick"]
 set :environment, :production
@@ -96,6 +96,7 @@ end
             (
               id bigint not null AUTO_INCREMENT,
               name varchar(255) not null,
+              refresh_timeout bigint not null,
               instance_prefix varchar(255) not null,
               primary key (id)
             )

data/lib/cloudboot/instance.rb

@@ -5,5 +5,6 @@ module Cloudboot
     def fqdn
       "#{name}.#{domain.name}"
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudboot
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jan Zimmek