corl 0.4.2 → 0.4.3

data/lib/corl.rb

@@ -17,6 +17,7 @@ lib_dir          = File.dirname(__FILE__)
 core_dir         = File.join(lib_dir, 'core')
 mixin_dir        = File.join(core_dir, 'mixin')
 mixin_action_dir = File.join(mixin_dir, 'action')
+macro_dir        = File.join(mixin_dir, 'macro')
 util_dir         = File.join(core_dir, 'util')
 mod_dir          = File.join(core_dir, 'mod')
  
@@ -34,15 +35,19 @@ CORL = Nucleon
 
 require 'hiera'
 require 'facter'
+require 'puppet'
+require 'puppet/configurer'
 
-#---
+#-------------------------------------------------------------------------------
+# Localization
 
 # TODO: Make this dynamically settable
 
 I18n.enforce_available_locales = false
 I18n.load_path << File.expand_path(File.join('..', 'locales', 'en.yml'), lib_dir)
 
-#---
+#-------------------------------------------------------------------------------
+# Include CORL libraries
 
 # Mixins for classes
 Dir.glob(File.join(mixin_dir, '*.rb')).each do |file|
@@ -51,17 +56,41 @@ end
 Dir.glob(File.join(mixin_action_dir, '*.rb')).each do |file|
   require file
 end
+Dir.glob(File.join(macro_dir, '*.rb')).each do |file|
+  require file
+end
 
 #---
 
 # Include CORL utilities
-#[].each do |name| 
-#  nucleon_require(util_dir, name)
-#end
+[ :puppet ].each do |name| 
+  nucleon_require(util_dir, name)
+end
 
 # Special errors
 nucleon_require(core_dir, :errors)
 
+#-------------------------------------------------------------------------------
+# Class and module additions / updates
+
+module Nucleon
+  class Config
+    extend Mixin::Lookup
+    include Mixin::Lookup  
+  end
+  
+  #---
+  
+  module Plugin
+    class Base
+      extend Mixin::Macro::NetworkSettings    
+    end
+  end
+end
+
+#-------------------------------------------------------------------------------
+# Include CORL plugins
+
 # Include facade
 nucleon_require(core_dir, :facade)
 
@@ -77,12 +106,6 @@ module CORL
     File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))  
   end
   
-  #-----------------------------------------------------------------------------
-  
-  class Config
-    include Mixin::Lookup  
-  end
-  
   #-----------------------------------------------------------------------------
   # CORL initialization
   

data/lib/facter/corl_build.rb

@@ -0,0 +1,8 @@
+
+Facter.add(:corl_build) do
+  confine :kernel => :linux # TODO: Extend this to work with more systems
+    
+  setcode do
+    File.join(Facter.value('corl_network'), 'build')
+  end
+end

data/lib/facter/corl_exists.rb

@@ -3,13 +3,13 @@ Facter.add(:corl_exists) do
   confine :kernel => :linux
   
   setcode do
+    corl_exists = nil 
     begin
       Facter::Util::Resolution::exec('gem list corl -i 2> /dev/null')
       corl_exists = true if $?.exitstatus == 0
       
     rescue Exception # Prevent abortions.
-    end
-    
-    corl_exists ? true : nil
+    end    
+    corl_exists
   end
 end

data/lib/facter/corl_network.rb

@@ -1,6 +1,6 @@
 
 Facter.add(:corl_network) do
-  confine :kernel => :linux
+  confine :kernel => :linux # TODO: Extend this to work with more systems
     
   setcode do
     require 'corl'

data/lib/facter/custom_facts.rb

@@ -0,0 +1,24 @@
+
+begin
+  require 'corl'
+
+  # Load network if it exists
+  if CORL.admin?
+    network_path   = Facter.value("corl_network")
+    network_config = CORL.config(:network, { :directory => network_path, :name => network_path })    
+    network        = CORL.network(CORL.sha1(network_config), network_config, :default)
+
+    if network && node = network.local_node
+      CORL::Util::Data.hash(node[:facts]).each do |name, value|    
+        Facter.add(name) do
+          confine :kernel => :linux # TODO: Extend this to work with more systems
+    
+          setcode do
+            value
+          end
+        end
+      end
+    end
+  end
+rescue # Prevent abortions if does not exist
+end

data/lib/facter/vagrant_exists.rb

@@ -0,0 +1,15 @@
+
+Facter.add(:vagrant_exists) do
+  confine :kernel => :linux
+  
+  setcode do
+    vagrant_exists = nil    
+    begin
+      Facter::Util::Resolution::exec('id vagrant 2> /dev/null')
+      vagrant_exists = true if $?.exitstatus == 0
+      
+    rescue Exception # Prevent abortions.
+    end    
+    vagrant_exists
+  end
+end

data/lib/hiera/corl_logger.rb

@@ -1,6 +1,6 @@
 
 class Hiera
-  module CORL_logger
+  module Corl_logger
     class << self
       def suitable?
         defined?(::CORL) == "constant"

data/lib/puppet/indirector/corl.rb

@@ -13,12 +13,12 @@ class Puppet::Indirector::CORL < Puppet::Indirector::Terminus
   #---
 
   def find(request)
-    config = CORL::Config.init({}, [ :all, :param, :data_binding ], {
+    config = CORL::Config.init_flat({}, [ :param, :data_binding ], {
+      :provisioner  => :puppetnode,
       :hiera_scope  => request.options[:variables],
       :puppet_scope => request.options[:variables],
       :search       => 'core::default',
       :search_name  => false,
-      :init_fact    => 'corl_config_ready',
       :force        => true,
       :merge        => true
     })    

data/lib/puppet/parser/functions/corl_include.rb

@@ -25,20 +25,16 @@ If no value is found in the defined sources, it does not include any classes.
 
       var_name   = args[0]
       parameters = ( args.size > 1 ? args[1] : {} )
-      options    = ( args.size > 2 ? args[2] : {} ) 
-            
-      unless CORL.provisioner(:puppet).include(var_name, parameters, options)
-        # Throw an error if we didn't evaluate all of the classes.
-        str = "Could not find class"
-        str += "es" if missing.length > 1
-
-        str += " " + missing.join(", ")
-
-        if n = namespaces and ! n.empty? and n != [""]
-          str += " in namespaces #{@namespaces.join(", ")}"
-        end
-        self.fail Puppet::ParseError, str
-      end      
+      options    = ( args.size > 2 ? args[2] : {} )
+      
+      config = CORL::Config.init_flat(options, [ :include ], {
+        :hiera_scope  => self,
+        :puppet_scope => self,
+        :search       => 'core::default',
+        :force        => true,
+        :merge        => true
+      })
+      CORL::Util::Puppet.include(var_name, parameters, config)
     end
   end
 end

data/lib/puppet/parser/functions/corl_initialize.rb

@@ -0,0 +1,15 @@
+#
+# corl_initialize.rb
+#
+# Initialize the CORL plugin system through Puppet
+#
+module Puppet::Parser::Functions
+  newfunction(:corl_initialize, :doc => <<-EOS
+This function initializes the CORL plugin system through Puppet.
+    EOS
+) do |args|    
+    CORL.run do
+      CORL::Util::Puppet.register_plugins({ :puppet_scope => self })
+    end
+  end
+end

data/lib/puppet/parser/functions/{deep_merge.rb → corl_merge.rb}

@@ -1,17 +1,17 @@
 #
-# deep_merge.rb
+# corl_merge.rb
 #
 # Merges multiple hashes together recursively.
 #
 module Puppet::Parser::Functions
-  newfunction(:deep_merge, :type => :rvalue, :doc => <<-EOS
-This function Merges multiple hashes together recursively.
+  newfunction(:corl_merge, :type => :rvalue, :doc => <<-EOS
+This function merges multiple hashes together recursively.
     EOS
 ) do |args|
     
     value = nil
     CORL.run do
-      raise(Puppet::ParseError, "deep_merge(): Define at least one hash " +
+      raise(Puppet::ParseError, "corl_merge(): Define at least one hash " +
         "given (#{args.size} for 1)") if args.size < 1
       
       value = CORL::Util::Data.merge(args)

data/lib/puppet/parser/functions/corl_resources.rb

@@ -39,20 +39,25 @@ If no resources are found, it returns without creating anything.
       options         = ( args[4] ? args[4] : {} )
 
       config = CORL::Config.init_flat(options, [ :resource, :corl_resources ], {
+        :provisioner     => :puppetnode,
         :hiera_scope     => self,
         :puppet_scope    => self,
         :search          => 'core::default',
-        :init_fact       => 'hiera_ready',
         :force           => true,
         :merge           => true,
         :resource_prefix => tag,
         :title_prefix    => tag
-      })
+      })      
+      unless tag.empty?
+        config[:tag]             = tag
+        config[:resource_prefix] = tag
+        config[:title_prefix]    = tag
+      end
       
       resources = CORL::Config.normalize(resources, override_var, config)
       defaults  = CORL::Config.normalize(defaults, default_var, config)
-          
-      CORL.provisioner(:puppet).add(definition_name, resources, defaults, config)
+      
+      CORL::Util::Puppet.add(definition_name, resources, defaults, config)
     end
   end
 end

data/lib/puppet/parser/functions/global_array.rb

@@ -21,10 +21,10 @@ If no value is found in the defined sources, it returns an empty array ([])
       options  = ( args.size > 2 ? args[2] : {} )
     
       config = CORL::Config.init_flat(options, [ :param, :global_array ], {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })

data/lib/puppet/parser/functions/global_hash.rb

@@ -21,10 +21,10 @@ If no value is found in the defined sources, it returns an empty hash ({})
       options  = ( args.size > 2 ? args[2] : {} )
     
       config = CORL::Config.init_flat(options, [ :param, :global_hash ], {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })

data/lib/puppet/parser/functions/global_param.rb

@@ -29,10 +29,10 @@ If no value is found in the defined sources, it returns an empty string ('')
       options  = ( args.size > 2 ? args[2] : {} )
     
       config = CORL::Config.init_flat(options, [ :param, :global_param ], {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })

data/lib/puppet/parser/functions/interpolate.rb

@@ -19,7 +19,7 @@ This function interpolates values from one hash to another for configuration inj
       options = ( args.size > 2 ? args[2] : {} )
       
       config = CORL::Config.init_flat(options, [ :data, :interpolate ])
-      value  = CORL::Util::Data.interpolate(value, data, config.options)
+      value  = CORL::Util::Data.interpolate(value, data, config.export)
     end
     return value
   end

data/lib/puppet/parser/functions/module_array.rb

@@ -14,24 +14,23 @@ If no value is found in the defined sources, it returns an empty array ([])
       raise(Puppet::ParseError, "module_array(): Define at least the variable name " +
         "given (#{args.size} for 1)") if args.size < 1
 
-      var_name      = args[0]
-      default_value = ( args.size > 1 ? args[1] : [] )
-      options       = ( args.size > 2 ? args[2] : {} )
-
-      module_name      = self.source.module_name
-      module_var_name  = "#{module_name}::#{var_name}"
-      default_var_name = "#{module_name}::default::#{var_name}"
+      var_name = args[0]
+      default  = ( args.size > 1 ? args[1] : [] )
+      options  = ( args.size > 2 ? args[2] : {} )
+      
+      module_name     = self.source.module_name
+      module_var_name = "#{module_name}::#{var_name}"
       
       config = CORL::Config.init(options, [ :param, :module_array ], module_name, {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
         :search_name  => false,
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })
-      value = CORL::Config.lookup_array([ module_var_name, default_var_name ], default, config)
+      value = CORL::Config.lookup_array(module_var_name, default, config)
     end
     return value
   end

data/lib/puppet/parser/functions/module_hash.rb

@@ -14,24 +14,23 @@ If no value is found in the defined sources, it returns an empty hash ({})
       raise(Puppet::ParseError, "module_hash(): Define at least the variable name " +
         "given (#{args.size} for 1)") if args.size < 1
 
-      var_name      = args[0]
-      default_value = ( args.size > 1 ? args[1] : {} )
-      options       = ( args.size > 2 ? args[2] : {} )
+      var_name = args[0]
+      default  = ( args.size > 1 ? args[1] : {} )
+      options  = ( args.size > 2 ? args[2] : {} )
     
-      module_name      = self.source.module_name
-      module_var_name  = "#{module_name}::#{var_name}"
-      default_var_name = "#{module_name}::default::#{var_name}"
+      module_name     = self.source.module_name
+      module_var_name = "#{module_name}::#{var_name}"
       
       config = CORL::Config.init(options, [ :param, :module_hash ], module_name, {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
         :search_name  => false,
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })
-      value = CORL::Config.lookup_hash([ module_var_name, default_var_name ], default, config)
+      value = CORL::Config.lookup_hash(module_var_name, default, config)
     end
     return value
   end

data/lib/puppet/parser/functions/module_param.rb

@@ -28,20 +28,19 @@ If no value is found in the defined sources, it returns an empty string ('')
       default  = ( args.size > 1 ? args[1] : '' )
       options  = ( args.size > 2 ? args[2] : {} )
     
-      module_name      = self.source.module_name
-      module_var_name  = "#{module_name}::#{var_name}"
-      default_var_name = "#{module_name}::default::#{var_name}"
+      module_name     = self.source.module_name
+      module_var_name = "#{module_name}::#{var_name}"
       
       config = CORL::Config.init(options, [ :param, :module_param ], module_name, {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
         :search_name  => false,
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })
-      value = CORL::Config.lookup([ module_var_name, default_var_name ], default, config)
+      value = CORL::Config.lookup(module_var_name, default, config)
     end
     return value
   end

data/lib/puppet/parser/functions/name.rb

@@ -14,7 +14,7 @@ This function returns a standardized form of a given resource name.
       raise(Puppet::ParseError, "name(): Must have a resource name specified; " +
         "given (#{args.size} for 1)") if args.size < 1
       
-      name = CORL.provisioner(:puppet).to_name(args[0])
+      name = CORL::Util::Puppet.to_name(args[0])
     end
     return name
   end

data/lib/puppet/parser/functions/render.rb

@@ -14,19 +14,19 @@ This function returns the string-ified form of a given value.
       raise(Puppet::ParseError, "render(): Must have a template class name and an optional source value specified; " +
         "given (#{args.size} for 2)") if args.size < 1
     
-      class_name = args[0]  
-      data       = ( args.size > 1 ? args[1] : {} )
-      options    = ( args.size > 2 ? args[2] : {} )
+      provider = args[0]  
+      data     = ( args.size > 1 ? args[1] : {} )
+      options  = ( args.size > 2 ? args[2] : {} )
     
       config = CORL::Config.init_flat(options, [ :data, :render ], {
+        :provisioner  => :puppetnode,
         :hiera_scope  => self,
         :puppet_scope => self,
         :search       => 'core::default',
-        :init_fact    => 'hiera_ready',
         :force        => true,
         :merge        => true
       })
-      value = CORL.template(class_name, config).render(data)
+      value = CORL.template(config, provider).render(data)
     end
     return value
   end