corl 0.4.29 → 0.5.0

data/lib/core/plugin/configuration.rb

@@ -1,10 +1,16 @@
 
-module Nucleon
+module CORL
 module Plugin
-class Configuration < CORL.plugin_class(:base)
+class Configuration < CORL.plugin_class(:nucleon, :base)
     
   include Mixin::SubConfig
 
+  #---
+  
+  def self.register_ids
+    [ :name, :directory ]
+  end
+   
   #-----------------------------------------------------------------------------
   # Configuration plugin interface
   
@@ -22,7 +28,7 @@ class Configuration < CORL.plugin_class(:base)
       :create        => _delete(:create, false),
       :pull          => true,
       :internal_ip   => CORL.public_ip, # Needed for seeding Vagrant VMs
-      :manage_ignore => true
+      :manage_ignore => _delete(:manage_ignore, true)
     }), _delete(:project_provider))
         
     _init(:autoload, true)

data/lib/core/plugin/fog_machine.rb

@@ -5,7 +5,7 @@ nucleon_require(File.dirname(__FILE__), :machine)
 
 module CORL
 module Machine
-class Fog < CORL.plugin_class(:machine)
+class Fog < CORL.plugin_class(:CORL, :machine)
   
   include Mixin::Machine::SSH
  
@@ -184,7 +184,7 @@ class Fog < CORL.plugin_class(:machine)
   def reload(options = {}, &code)
     super do |config|
       success = code ? code.call(config) : true            
-      success = init_ssh_session(true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
+      success = init_ssh_session(true, config.get(:tries, 12), config.get(:sleep_time, 5)) if success
     end
   end
 
@@ -195,7 +195,7 @@ class Fog < CORL.plugin_class(:machine)
       image_name = sprintf("%s (%s)", node.plugin_name, Time.now.to_s)
       
       success = code ? code.call(image_name, config, success) : true 
-      success = init_ssh_session(true, config.get(:tries, 5), config.get(:sleep_time, 5)) if success
+      success = init_ssh_session(true, config.get(:tries, 12), config.get(:sleep_time, 5)) if success
     end
   end
   

data/lib/core/plugin/fog_node.rb

@@ -5,7 +5,7 @@ nucleon_require(File.dirname(__FILE__), :node)
 
 module CORL
 module Node
-class Fog < CORL.plugin_class(:node)
+class Fog < CORL.plugin_class(:CORL, :node)
  
   #-----------------------------------------------------------------------------
   # Node plugin interface

data/lib/core/plugin/machine.rb

@@ -1,7 +1,7 @@
 
-module Nucleon
+module CORL
 module Plugin
-class Machine < CORL.plugin_class(:base)
+class Machine < CORL.plugin_class(:nucleon, :base)
 
   #-----------------------------------------------------------------------------
   # Machine plugin interface

data/lib/core/plugin/network.rb

@@ -1,7 +1,7 @@
 
-module Nucleon
+module CORL
 module Plugin
-class Network < CORL.plugin_class(:base)
+class Network < CORL.plugin_class(:nucleon, :base)
   
   init_plugin_collection(:add_node, :batch) 
   
@@ -11,12 +11,15 @@ class Network < CORL.plugin_class(:base)
   def normalize(reload)
     super
     
-    logger.info("Initializing sub configuration from source with: #{myself._export.inspect}")
+    logger.info("Initializing network: reloading? #{reload}")
     myself.config = CORL.configuration(Config.new(myself._export).import({ :autosave => false, :create => false })) unless reload
     
     config.delete(:directory) # TODO: Figure out what to do with this??
     
-    ignore('build')
+    unless reload
+      @build = Build.new
+      ignore([ 'build', File.join('config', 'identities') ])
+    end
   end
   
   #---
@@ -39,15 +42,26 @@ class Network < CORL.plugin_class(:base)
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
   
-  plugin_collection :node
-  plugin_collection :provisioner
+  plugin_collection :CORL, :node
+  plugin_collection :CORL, :builder, :single_instance => true
+  plugin_collection :CORL, :provisioner
+  
+  #---
+  
+  def hiera_var
+    @hiera
+  end
+  
+  def hiera_var=hiera
+    @hiera = hiera
+  end
   
   #---
   
   def hiera_override_dir
     File.join(directory, 'config')
   end
-  
+   
   #---
   
   def home
@@ -68,6 +82,11 @@ class Network < CORL.plugin_class(:base)
   
   #---
   
+  def key_cache_directory
+    File.join(build_directory, 'keys')
+  end
+  #---
+  
   def cache
     config.cache
   end
@@ -195,6 +214,12 @@ class Network < CORL.plugin_class(:base)
     CORL.node(:test, config.export, provider)
   end
   
+  #---
+  
+  def build
+    @build
+  end
+  
   #-----------------------------------------------------------------------------
   # Operations
   
@@ -247,7 +272,7 @@ class Network < CORL.plugin_class(:base)
   def add_node(provider, name, options = {})
     config = Config.ensure(options)
     
-    keypair = config.delete(:keypair, nil)
+    keypair = config.get(:keypair, nil)
     return false unless keypair && keypair.is_a?(Util::SSH::Keypair)
         
     remote_name = config.delete(:remote, :edit)
@@ -270,11 +295,15 @@ class Network < CORL.plugin_class(:base)
     yield(:preprocess, hook_config) if block_given?
     
     if ! node.local? && node.attach_keys(keypair) && extension_check(:add_node, hook_config)
+      node.keypair = keypair
+      
       # Create new node / machine
       success = node.create do |op, data|
         block_given? ? yield("create_#{op}".to_sym, data) : data
       end
       
+      remote_name = nil if remote_name && ! remote(remote_name)
+      
       if success && node.save({ :remote => remote_name, :message => "Created machine #{name} on #{provider}" })
         success = init_node(node, config.defaults({ :bootstrap => true, :seed => true })) do |op, data|
           block_given? ? yield(op, data) : data  
@@ -335,7 +364,7 @@ class Network < CORL.plugin_class(:base)
         
         if success && seed_project
           # Seed machine with remote project reference
-          result = node.seed({
+          result = node.node_seed({
             :project_reference => seed_project,
             :project_branch    => seed_branch
           }) do |op, data|
@@ -349,7 +378,7 @@ class Network < CORL.plugin_class(:base)
       
       if success && provision
         # Run configured provisioners on machine
-        result = node.provision(config) do |op, data|
+        result = node.node_provision(config) do |op, data|
           yield("provision_#{op}".to_sym, data)  
         end
         success = result.status == code.success

data/lib/core/plugin/node.rb

@@ -1,7 +1,7 @@
 
-module Nucleon
+module CORL
 module Plugin
-class Node < CORL.plugin_class(:base)
+class Node < CORL.plugin_class(:nucleon, :base)
   
   include Parallel
   external_block_exec :exec, :command, :action
@@ -85,19 +85,53 @@ class Node < CORL.plugin_class(:base)
   
   #---
   
+  def fact_var
+    @facts
+  end
+  
+  def fact_var=facts
+    @facts = facts
+  end
+ 
+  #---
+  
+  def facts(reset = false, clone = true)
+    if reset || fact_var.nil?
+      default_configs = extended_config(:hiera_default_facts, {
+        :fqdn          => hostname, 
+        :hostname      => hostname.gsub(/\..*$/, ''),
+        :corl_provider => plugin_provider.to_s
+      })
+      self.fact_var = Config.new(lookup_facts).defaults(default_configs).export
+    end
+    return fact_var.clone if clone
+    fact_var
+  end
+  
+  #---
+  
+  def hiera_var
+    @hiera
+  end
+  
+  def hiera_var=hiera
+    @hiera = hiera
+  end
+  
+  #---
+  
   def hiera_override_dir
     network.hiera_override_dir
   end
   
   #---
   
-  def hiera_facts
-    default_configs = extended_config(:hiera_default_facts, {
-      :fqdn          => hostname, 
-      :hostname      => hostname.gsub(/\..*$/, ''),
-      :corl_provider => plugin_provider.to_s
-    })
-    Config.new(lookup_facts).defaults(default_configs).export
+  def keypair
+    @keypair
+  end
+  
+  def keypair=keypair
+    @keypair = keypair
   end
   
   #---
@@ -144,6 +178,10 @@ class Node < CORL.plugin_class(:base)
   def hostname
     hostname = setting(:hostname)
     
+    unless hostname
+      hostname = plugin_name
+    end
+    
     if hostname.to_s != ui.resource.to_s 
       ui.resource = Util::Console.colorize(hostname, @class_color)
       logger      = hostname
@@ -317,7 +355,7 @@ class Node < CORL.plugin_class(:base)
     provisioner_info = {}
         
     # Compose needed provisioners and profiles
-    profiles.each do |profile|        
+    profiles.each do |profile|
       if info = Plugin::Provisioner.translate_reference(profile)
         provider = info[:provider]
             
@@ -377,32 +415,51 @@ class Node < CORL.plugin_class(:base)
     config  = Config.ensure(options)
     success = true
     
-    provisioners.each do |provider, collection|
-      ui.info("Building #{provider} provisioner collection")
-          
-      collection.each do |name, provisioner|
-        ui.info("Building #{name} provisioner")
+    # TODO: Figure out what's going on with the parallel implementation here.
+    ENV['NUCLEON_NO_PARALLEL'] = 'true'
+    
+    status  = parallel(:build_provider, network.builders, config)
+    success = false if status.values.include?(false)
+    
+    if success
+      status  = parallel(:build_provisioners, provisioners, config)
+      success = false if status.values.include?(false)
+    
+      if success
+        myself.build_time = Time.now.to_s if success
         
-        unless provisioner.build(options)
-          success = false
-          break
+        if config.delete(:save, true)
+          ui.success("Saving successful build")    
+         
+          success = save(extended_config(:build, {
+            :message => config.get(:message, "Built #{plugin_provider} node: #{plugin_name}"),
+            :remote  => config.get(:remote, :edit)  
+          }))
         end
       end
     end
     
-    myself.build_time = Time.now.to_s if success
+    ENV['NUCLEON_NO_PARALLEL'] = nil
     
-    if success && config.delete(:save, true)
-      ui.success("Saving successful build")    
-    
-      success = save(extended_config(:build, {
-        :message => config.get(:message, "Built #{plugin_provider} node: #{plugin_name}"),
-        :remote  => config.get(:remote, :edit)  
-      }))
-    end
     success
   end
   
+  def build_provider(provider, plugin, config)
+    ui.info("Building #{provider} components")
+    plugin.build(myself, config)
+  end
+  
+  def build_provisioners(provider, collection, config)
+    ui.info("Building #{provider} provisioner collection")
+    status = parallel(:build_provisioner, collection, provider, config)
+    status.values.include?(false) ? false : true  
+  end
+  
+  def build_provisioner(name, plugin, provider, config)
+    ui.info("Building #{provider} #{name} provisioner components")
+    plugin.build(myself, config) 
+  end
+  
   #---
   
   def attach_keys(keypair)
@@ -424,6 +481,9 @@ class Node < CORL.plugin_class(:base)
       if private_key && public_key
         FileUtils.chmod(0600, private_key)
         FileUtils.chmod(0644, public_key)
+        
+        myself.keypair = Util::SSH.generate({ :private_key => keypair.private_key })
+        myself.keypair.store(network.key_cache_directory, plugin_name)
       
         save_config[:files] = [ private_key, public_key ]
     
@@ -471,7 +531,7 @@ class Node < CORL.plugin_class(:base)
   #---
   
   def create_machine(name, provider, options = {})
-    CORL.create_plugin(:machine, provider, extended_config(name, options).import({ :meta => { :parent => myself }}))
+    CORL.create_plugin(:CORL, :machine, provider, extended_config(name, options).import({ :meta => { :parent => myself }}))
   end
   
   #---
@@ -651,7 +711,7 @@ class Node < CORL.plugin_class(:base)
             end
             results = test if test
             
-          rescue Exception => error
+          rescue => error
             default_error.append_errors(error.message)   
           end
         else
@@ -726,7 +786,7 @@ class Node < CORL.plugin_class(:base)
     
     encoded_config = Util::CLI.encode(Util::Data.clean(config.export))
     action_config  = extended_config(:action, {
-      :command => provider, 
+      :command => provider.to_s.gsub('_', ' '), 
       :data    => { :encoded => encoded_config }
     })
     
@@ -792,7 +852,7 @@ class Node < CORL.plugin_class(:base)
         return Util::Data.symbol_map(Util::Data.parse_json(result.output))
       end
     end
-    local? ? facts : custom_facts
+    local? ? Util::Data.merge([ CORL.facts, custom_facts ]) : custom_facts
   end
   
   #---
@@ -801,13 +861,13 @@ class Node < CORL.plugin_class(:base)
     if ! local? && bootstrap_script
       config = Config.ensure(options).import({ :property => property })
       result = run.lookup(config)
-    
+      
       if result.status == code.success
         return Util::Data.value(Util::Data.parse_json(result.output), default)
       end
       return default
     end
-    options[:hiera_scope] = Util::Data.prefix('::', lookup_facts, '')
+    options[:hiera_scope] = Util::Data.prefix('::', facts, '')
     lookup(property, default, options)  
   end
   
@@ -1138,9 +1198,9 @@ class Node < CORL.plugin_class(:base)
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def self.build_info(type, data)  
+  def self.build_info(namespace, plugin_type, data)  
     data = data.split(/\s*,\s*/) if data.is_a?(String)
-    super(type, data)
+    super(namespace, plugin_type, data)
   end
   
   #---