corl 0.4.15 → 0.4.16

data/lib/CORL/action/provision.rb

@@ -8,8 +8,7 @@ class Provision < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure,
-            :provision_failure
+      codes :provision_failure
             
       register :dry_run, :bool, false
     end
@@ -20,9 +19,9 @@ class Provision < Plugin::CloudAction
   
   def execute
     super do |node, network|
-      if network && node
-        info('corl.actions.provision.start')
-        
+      info('corl.actions.provision.start')
+      
+      ensure_node(node) do        
         success = true
         
         if CORL.admin?
@@ -47,8 +46,6 @@ class Provision < Plugin::CloudAction
             myself.status = code.provision_failure unless success
           end
         end
-      else
-        myself.status = code.network_failure  
       end
     end
   end

data/lib/CORL/action/regions.rb

@@ -30,19 +30,21 @@ class Regions < Plugin::CloudAction
     super do |local_node, network|
       info('corl.actions.regions.start')
       
-      if node = network.test_node(settings[:node_provider])
-        if regions = node.regions
-          regions.each do |region|
-            render(sprintf("> %s", region), { :prefix => false })
-          end
+      ensure_network(network) do
+        if node = network.test_node(settings[:node_provider])
+          if regions = node.regions
+            regions.each do |region|
+              render(sprintf("> %s", region), { :prefix => false })
+            end
           
-          myself.result = regions
-          success('corl.actions.regions.results', { :regions => regions.length }) if regions.length > 1
+            myself.result = regions
+            success('corl.actions.regions.results', { :regions => regions.length }) if regions.length > 1
+          else
+            myself.status = code.region_load_failure
+          end
         else
-          myself.status = code.region_load_failure
+          myself.status = code.node_load_failure
         end
-      else
-        myself.status = code.node_load_failure
       end
     end
   end

data/lib/CORL/action/seed.rb

@@ -49,7 +49,7 @@ class Seed < Plugin::CloudAction
     super do |node, network|
       info('corl.actions.seed.start')
       
-      if node && network
+      ensure_node(node) do
         admin_exec do
           network_path = lookup(:corl_network)
           backup_path  = File.join(Dir.tmpdir(), 'corl')
@@ -69,13 +69,14 @@ class Seed < Plugin::CloudAction
             
             render("Seeding network configuration from #{settings[:project_reference]}")
             project = CORL.project(extended_config(:project, {
-              :directory => network_path,
-              :reference => project_info.get(:reference, nil),
-              :url       => project_info.get(:url, settings[:project_reference]),
-              :revision  => project_info.get(:revision, settings[:project_branch]),
-              :create    => true,
-              :pull      => true,
-              :keys      => keys
+              :directory   => network_path,
+              :reference   => project_info.get(:reference, nil),
+              :url         => project_info.get(:url, settings[:project_reference]),
+              :revision    => project_info.get(:revision, settings[:project_branch]),
+              :create      => true,
+              :pull        => true,
+              :keys        => keys,
+              :internal_ip => CORL.public_ip # Needed for seeding Vagrant VMs
             }), project_info[:provider])
         
             if project
@@ -105,8 +106,6 @@ class Seed < Plugin::CloudAction
             myself.status = code.key_store_failure
           end
         end
-      else
-        myself.status = code.network_load_failure    
       end
     end
   end

data/lib/CORL/action/spawn.rb

@@ -10,23 +10,20 @@ class Spawn < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure,
-            :key_failure,
+      codes :key_failure,
             :node_create_failure
       
       register :groups, :array, []      
       register :region, :str, nil
       register :machine_type, :str, nil
       register :image, :str, nil
-      register :user, :str, :root     
+      register :user, :str, nil     
       register :hostnames, :array, nil
         
       keypair_config
       
       config.defaults(CORL.action_config(:bootstrap))
       config.defaults(CORL.action_config(:seed))
-      
-      config[:project_reference].default = "github:::coraltech/cluster-test[master]"
     end
   end
   
@@ -45,18 +42,32 @@ class Spawn < Plugin::CloudAction
  
   def execute
     super do |node, network|
-      info('corl.actions.spawn.start')      
-      
-      if network
+      ensure_network(network) do
         if keypair && keypair_clean
           hostnames     = []
           results       = []
           node_provider = settings.delete(:node_provider)
           
+          if CORL.vagrant? && ! CORL.loaded_plugins(:node).keys.include?(node_provider.to_sym)
+            settings[:machine_type] = node_provider
+            settings[:user]         = :vagrant unless settings[:user]            
+            node_provider           = :vagrant
+          end
+          unless settings[:user]
+            settings[:user] = :root  
+          end
+          
+          info('corl.actions.spawn.start', { :node_provider => node_provider }) 
+          
           settings.delete(:hostnames).each do |hostname|
             hostnames << extract_hostnames(hostname)
           end
           hostnames.flatten.each do |hostname|
+            if hostname.is_a?(Hash)
+              settings[:public_ip] = hostname[:ip]
+              hostname             = hostname[:hostname]  
+            end
+            
             if settings[:parallel]
               results << network.future.add_node(node_provider, hostname, settings)
             else
@@ -68,8 +79,6 @@ class Spawn < Plugin::CloudAction
         else
           myself.status = code.key_failure  
         end        
-      else
-        myself.status = code.network_failure    
       end
     end
   end
@@ -82,14 +91,19 @@ class Spawn < Plugin::CloudAction
     
     if hostname.match(/([^\[]+)\[([^\]]+)\](.*)/)
       before = $1
-      range  = $2
+      extra  = $2.strip
       after  = $3
       
-      low, high = range.split(/\s*\-\s*/)
-      range     = Range.new(low, high)
+      if extra.match(/\-/)
+        low, high = extra.split(/\s*\-\s*/)
+        range     = Range.new(low, high)
       
-      range.each do |item|
-        hostnames << "#{before}#{item}#{after}"  
+        range.each do |item|
+          hostnames << "#{before}#{item}#{after}"  
+        end
+        
+      elsif extra.match(/\d+\.\d+\.\d+\.\d+/)
+        hostnames = [ { :hostname => "#{before}#{after}", :ip => extra } ]  
       end
     else
       hostnames = [ hostname ]

data/lib/CORL/action/ssh.rb

@@ -8,8 +8,6 @@ class Ssh < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-      
       register :ssh_nodes, :array, nil do |values|
         if values.nil?
           warn('corl.actions.bootstrap.errors.ssh_nodes_empty')
@@ -49,7 +47,7 @@ class Ssh < Plugin::CloudAction
     
   def execute
     super do |local_node, network|
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:ssh_nodes], settings[:node_provider], false) do |node|
           render_options = { :id => node.id, :hostname => node.hostname }
           
@@ -64,8 +62,6 @@ class Ssh < Plugin::CloudAction
           success
         end
         myself.status = code.batch_error unless batch_success
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/start.rb

@@ -8,8 +8,6 @@ class Start < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-      
       register :start_nodes, :array, nil do |values|
         if values.nil?
           warn('corl.actions.start.errors.start_nodes_empty')
@@ -47,14 +45,12 @@ class Start < Plugin::CloudAction
    
   def execute
     super do |local_node, network|
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:start_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.start.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.start 
         end
         myself.status = code.batch_error unless batch_success
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/stop.rb

@@ -8,8 +8,6 @@ class Stop < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-            
       register :stop_nodes, :array, nil do |values|
         if values.nil?
           warn('corl.actions.stop.errors.stop_nodes_empty')
@@ -47,14 +45,12 @@ class Stop < Plugin::CloudAction
    
   def execute
     super do |local_node, network|
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:stop_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.stop.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.stop  
         end
         myself.status = code.batch_error unless batch_success
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/vagrantfile.rb

@@ -0,0 +1,55 @@
+
+module CORL
+module Action
+class Vagrantfile < Plugin::CloudAction
+
+  #-----------------------------------------------------------------------------
+  # Settings
+  
+  def configure
+    super do    
+      codes :vagrant_backup_failure,
+            :vagrant_save_failure,
+            :network_save_failure
+    end
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Action operations
+   
+  def execute
+    super do |node, network|
+      info('corl.actions.vagrantfile.start')
+      
+      ensure_network(network) do
+        generated_vagrantfile_name = File.join(CORL.lib_path, 'core', 'vagrant', 'Vagrantfile')        
+        project_vagrantfile_name   = File.join(network.directory, 'Vagrantfile')
+        success                    = true
+                
+        corl_vagrantfile = Util::Disk.read(generated_vagrantfile_name)
+        
+        if File.exists?(project_vagrantfile_name)
+          unless FileUtils.mv(project_vagrantfile_name, "#{project_vagrantfile_name}.backup", :force => true)
+            myself.status = code.vagrant_backup_failure
+            success       = false
+          end
+        end
+        
+        if success
+          unless Util::Disk.write(project_vagrantfile_name, corl_vagrantfile)
+            myself.status = code.vagrant_save_failure
+            success       = false
+          end
+          
+          if success
+            unless network.save({ :files => 'Vagrantfile' })
+              myself.status = code.network_save_failure
+            end
+          end
+        end 
+      end
+    end
+  end
+end
+end
+end

data/lib/CORL/configuration/file.rb

@@ -175,9 +175,12 @@ class File < CORL.plugin_class(:configuration)
       separate.export.each do |config_name, router_data|
         info         = search[config_name]
         provider     = info[:provider]
-        file         = info[:file]        
+        file         = info[:file]
+        file_dir     = ::File.dirname(file)       
         deleted_keys = deleted_keys - [ config_name ]
         
+        FileUtils.mkdir_p(file_dir) unless Dir.exists?(file_dir)
+        
         if renderer = CORL.translator(method_config, provider)
           rendering = renderer.generate(router_data)
           

data/lib/CORL/machine/physical.rb

@@ -40,7 +40,7 @@ class Physical < CORL.plugin_class(:machine)
   #---
   
   def public_ip
-    CORL.ip_address
+    CORL.public_ip   
   end
   
   #---