corl 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771591634d3d162ff113af159f0ae8356fbb5e3d
-  data.tar.gz: ce7c3c645833fb2c1a32660729aa6570d5512ff0
+  metadata.gz: b1f29a3e15157033eb15220fec258f5dab7c864f
+  data.tar.gz: eedf1f77dd5ceb8a0bec1e3ee8051c36e2d52250
 SHA512:
-  metadata.gz: d7bf9faec68b5620b00642aac1fc9ea398e6078350762d0a6d1ab8a60eb18c7eaa16b75710ed73748d628c794b283b5954a4b51cbf721c9802660f664937fc7e
-  data.tar.gz: c26706cb1221278fae991507f94f03e346033652e5e0bbf1f0a6a25a31180e9e3f09ce9cf390a29d56cafe704c3f1046333b53c1e64254f87393bd208e2224a0
+  metadata.gz: 7f81cf183feae8f4b102389f115da4549c50f2fe6da18fa5db9e690a72b498de16689f634d0d5f2dfaec3c584afe188b5e45cfe9c92aa06b505fd66473a7be73
+  data.tar.gz: 3bce3004dc717b56ad801f1f6549aad4254d9a9374d273b81c37145cc04f8bf355ddd28048300dd8d551dac92a8de13698475481c2ca96f094b014810914cf03

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.5.0)
+    corl (0.5.1)
       facter (~> 2.1)
       fog (~> 1.20)
       hiera (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/bootstrap/os/ubuntu/06_puppet.sh

@@ -14,7 +14,7 @@ chmod 0644 /etc/apt/sources.list.d/corl_puppet.list || exit 62
 # Install Puppet
 apt-get -y update || exit 63
 
-apt-get -y install puppet-common="$PUPPET_PACKAGE" puppet="$PUPPET_PACKAGE" || exit 64
+apt-get -y install hiera puppet-common="$PUPPET_PACKAGE" puppet="$PUPPET_PACKAGE" || exit 64
 
 chown -R root:puppet /var/lib/puppet || exit 65
 

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-07-01"
+  s.date = "2014-07-10"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
     "lib/core/errors.rb",
     "lib/core/facade.rb",
     "lib/core/mixin/action/keypair.rb",
+    "lib/core/mixin/action/registration.rb",
     "lib/core/mixin/builder.rb",
     "lib/core/mixin/lookup.rb",
     "lib/core/mixin/machine/ssh.rb",
@@ -97,21 +98,27 @@ Gem::Specification.new do |s|
     "lib/facter/custom_facts.rb",
     "lib/facter/vagrant_exists.rb",
     "lib/hiera/corl_logger.rb",
+    "lib/nucleon/action/cloud/config.rb",
     "lib/nucleon/action/cloud/create.rb",
-    "lib/nucleon/action/cloud/hiera.rb",
     "lib/nucleon/action/cloud/images.rb",
     "lib/nucleon/action/cloud/inspect.rb",
     "lib/nucleon/action/cloud/machines.rb",
     "lib/nucleon/action/cloud/regions.rb",
+    "lib/nucleon/action/cloud/settings.rb",
     "lib/nucleon/action/cloud/vagrantfile.rb",
     "lib/nucleon/action/node/IP.rb",
     "lib/nucleon/action/node/SSH.rb",
     "lib/nucleon/action/node/authorize.rb",
     "lib/nucleon/action/node/bootstrap.rb",
     "lib/nucleon/action/node/build.rb",
+    "lib/nucleon/action/node/cache.rb",
     "lib/nucleon/action/node/destroy.rb",
     "lib/nucleon/action/node/exec.rb",
+    "lib/nucleon/action/node/fact.rb",
     "lib/nucleon/action/node/facts.rb",
+    "lib/nucleon/action/node/group.rb",
+    "lib/nucleon/action/node/groups.rb",
+    "lib/nucleon/action/node/identity.rb",
     "lib/nucleon/action/node/image.rb",
     "lib/nucleon/action/node/keypair.rb",
     "lib/nucleon/action/node/lookup.rb",
@@ -121,7 +128,12 @@ Gem::Specification.new do |s|
     "lib/nucleon/action/node/seed.rb",
     "lib/nucleon/action/node/spawn.rb",
     "lib/nucleon/action/node/start.rb",
+    "lib/nucleon/action/node/status.rb",
     "lib/nucleon/action/node/stop.rb",
+    "lib/nucleon/action/plugin/create.rb",
+    "lib/nucleon/action/plugin/list.rb",
+    "lib/nucleon/action/plugin/template/nucleon.action.erb",
+    "lib/nucleon/action/plugins.rb",
     "lib/nucleon/event/puppet.rb",
     "lib/nucleon/template/environment.rb",
     "lib/puppet/indirector/corl.rb",
@@ -293,6 +305,162 @@ Gem::Specification.new do |s|
     "rdoc/site/0.4.29/js/searcher.js",
     "rdoc/site/0.4.29/rdoc.css",
     "rdoc/site/0.4.29/table_of_contents.html",
+    "rdoc/site/0.5.0/CORL.html",
+    "rdoc/site/0.5.0/CORL/Build.html",
+    "rdoc/site/0.5.0/CORL/Builder.html",
+    "rdoc/site/0.5.0/CORL/Builder/Identity.html",
+    "rdoc/site/0.5.0/CORL/Builder/Package.html",
+    "rdoc/site/0.5.0/CORL/Configuration.html",
+    "rdoc/site/0.5.0/CORL/Configuration/File.html",
+    "rdoc/site/0.5.0/CORL/Errors.html",
+    "rdoc/site/0.5.0/CORL/Facade.html",
+    "rdoc/site/0.5.0/CORL/Machine.html",
+    "rdoc/site/0.5.0/CORL/Machine/AWS.html",
+    "rdoc/site/0.5.0/CORL/Machine/Fog.html",
+    "rdoc/site/0.5.0/CORL/Machine/Physical.html",
+    "rdoc/site/0.5.0/CORL/Machine/Rackspace.html",
+    "rdoc/site/0.5.0/CORL/Machine/Vagrant.html",
+    "rdoc/site/0.5.0/CORL/Mixin.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Action.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Action/Keypair.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Builder.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Builder/Global.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Builder/Instance.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Lookup.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Machine.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Machine/SSH.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Macro.html",
+    "rdoc/site/0.5.0/CORL/Mixin/Macro/NetworkSettings.html",
+    "rdoc/site/0.5.0/CORL/Network.html",
+    "rdoc/site/0.5.0/CORL/Network/CORL.html",
+    "rdoc/site/0.5.0/CORL/Node.html",
+    "rdoc/site/0.5.0/CORL/Node/AWS.html",
+    "rdoc/site/0.5.0/CORL/Node/Fog.html",
+    "rdoc/site/0.5.0/CORL/Node/Local.html",
+    "rdoc/site/0.5.0/CORL/Node/Rackspace.html",
+    "rdoc/site/0.5.0/CORL/Node/Vagrant.html",
+    "rdoc/site/0.5.0/CORL/Plugin.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Builder.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Configuration.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Machine.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Network.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Node.html",
+    "rdoc/site/0.5.0/CORL/Plugin/Provisioner.html",
+    "rdoc/site/0.5.0/CORL/Provisioner.html",
+    "rdoc/site/0.5.0/CORL/Provisioner/Puppetnode.html",
+    "rdoc/site/0.5.0/CORL/Util.html",
+    "rdoc/site/0.5.0/CORL/Util/Puppet.html",
+    "rdoc/site/0.5.0/CORL/Util/Puppet/Resource.html",
+    "rdoc/site/0.5.0/CORL/Util/Puppet/ResourceGroup.html",
+    "rdoc/site/0.5.0/CORL/Vagrant.html",
+    "rdoc/site/0.5.0/CORL/Vagrant/Config.html",
+    "rdoc/site/0.5.0/Fog.html",
+    "rdoc/site/0.5.0/Fog/Compute.html",
+    "rdoc/site/0.5.0/Fog/Compute/AWS.html",
+    "rdoc/site/0.5.0/Fog/Compute/AWS/Server.html",
+    "rdoc/site/0.5.0/Fog/Compute/RackspaceV2.html",
+    "rdoc/site/0.5.0/Fog/Compute/RackspaceV2/Server.html",
+    "rdoc/site/0.5.0/Hiera.html",
+    "rdoc/site/0.5.0/Hiera/Backend.html",
+    "rdoc/site/0.5.0/Hiera/Corl_logger.html",
+    "rdoc/site/0.5.0/Nucleon.html",
+    "rdoc/site/0.5.0/Nucleon/Action.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Create.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Hiera.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Images.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Inspect.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Machines.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Regions.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Cloud/Vagrantfile.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Authorize.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Bootstrap.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Build.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Destroy.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Exec.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Facts.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/IP.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Image.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Keypair.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Lookup.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Provision.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Reboot.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Revoke.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/SSH.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Seed.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Spawn.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Start.html",
+    "rdoc/site/0.5.0/Nucleon/Action/Node/Stop.html",
+    "rdoc/site/0.5.0/Nucleon/Config.html",
+    "rdoc/site/0.5.0/Nucleon/Event.html",
+    "rdoc/site/0.5.0/Nucleon/Event/Puppet.html",
+    "rdoc/site/0.5.0/Nucleon/Plugin.html",
+    "rdoc/site/0.5.0/Nucleon/Plugin/Base.html",
+    "rdoc/site/0.5.0/Nucleon/Plugin/CloudAction.html",
+    "rdoc/site/0.5.0/Nucleon/Template.html",
+    "rdoc/site/0.5.0/Nucleon/Template/Environment.html",
+    "rdoc/site/0.5.0/Object.html",
+    "rdoc/site/0.5.0/Puppet.html",
+    "rdoc/site/0.5.0/Puppet/DataBinding.html",
+    "rdoc/site/0.5.0/Puppet/DataBinding/Corl.html",
+    "rdoc/site/0.5.0/Puppet/Indirector.html",
+    "rdoc/site/0.5.0/Puppet/Indirector/Corl.html",
+    "rdoc/site/0.5.0/Puppet/Parser.html",
+    "rdoc/site/0.5.0/Puppet/Parser/Functions.html",
+    "rdoc/site/0.5.0/README_rdoc.html",
+    "rdoc/site/0.5.0/Vagrant.html",
+    "rdoc/site/0.5.0/Vagrant/Config.html",
+    "rdoc/site/0.5.0/Vagrant/Config/Loader.html",
+    "rdoc/site/0.5.0/Vagrant/Vagrantfile.html",
+    "rdoc/site/0.5.0/VagrantPlugins.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Action.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Action/DeleteCache.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Action/InitKeys.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Action/LinkNetwork.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/BaseAction.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Command.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Command/Launcher.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Config.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Config/CORL.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Plugin.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Provisioner.html",
+    "rdoc/site/0.5.0/VagrantPlugins/CORL/Provisioner/CORL.html",
+    "rdoc/site/0.5.0/created.rid",
+    "rdoc/site/0.5.0/images/add.png",
+    "rdoc/site/0.5.0/images/brick.png",
+    "rdoc/site/0.5.0/images/brick_link.png",
+    "rdoc/site/0.5.0/images/bug.png",
+    "rdoc/site/0.5.0/images/bullet_black.png",
+    "rdoc/site/0.5.0/images/bullet_toggle_minus.png",
+    "rdoc/site/0.5.0/images/bullet_toggle_plus.png",
+    "rdoc/site/0.5.0/images/date.png",
+    "rdoc/site/0.5.0/images/delete.png",
+    "rdoc/site/0.5.0/images/find.png",
+    "rdoc/site/0.5.0/images/loadingAnimation.gif",
+    "rdoc/site/0.5.0/images/macFFBgHack.png",
+    "rdoc/site/0.5.0/images/package.png",
+    "rdoc/site/0.5.0/images/page_green.png",
+    "rdoc/site/0.5.0/images/page_white_text.png",
+    "rdoc/site/0.5.0/images/page_white_width.png",
+    "rdoc/site/0.5.0/images/plugin.png",
+    "rdoc/site/0.5.0/images/ruby.png",
+    "rdoc/site/0.5.0/images/tag_blue.png",
+    "rdoc/site/0.5.0/images/tag_green.png",
+    "rdoc/site/0.5.0/images/transparent.png",
+    "rdoc/site/0.5.0/images/wrench.png",
+    "rdoc/site/0.5.0/images/wrench_orange.png",
+    "rdoc/site/0.5.0/images/zoom.png",
+    "rdoc/site/0.5.0/index.html",
+    "rdoc/site/0.5.0/js/darkfish.js",
+    "rdoc/site/0.5.0/js/jquery.js",
+    "rdoc/site/0.5.0/js/navigation.js",
+    "rdoc/site/0.5.0/js/search.js",
+    "rdoc/site/0.5.0/js/search_index.js",
+    "rdoc/site/0.5.0/js/searcher.js",
+    "rdoc/site/0.5.0/rdoc.css",
+    "rdoc/site/0.5.0/table_of_contents.html",
     "spec/corl_mock_input.rb",
     "spec/corl_test_kernel.rb",
     "spec/spec_helper.rb"

data/lib/CORL/builder/identity.rb

@@ -37,7 +37,7 @@ class Identity < CORL.plugin_class(:CORL, :builder)
     directory   = File.join(internal_path(build_directory), provider_id.to_s)
     success     = true
       
-    ui.info("Building identity #{blue(name)} at #{purple(project_reference)} into #{green(directory)}")
+    info("Building identity #{blue(name)} at #{purple(project_reference)} into #{green(directory)}", { :i18n => false })
       
     full_directory = File.join(network.directory, directory)
       
@@ -51,16 +51,19 @@ class Identity < CORL.plugin_class(:CORL, :builder)
         :manage_ignore => false
       }))
       unless project
-        ui.warn("Identity #{cyan(name)} failed to initialize")
+        warn("Identity #{cyan(name)} failed to initialize", { :i18n => false })
         success = false
       end
            
       if success
+        # Make thid project private.
+        FileUtils.chmod_R('go-wrx', full_directory)
+          
         set_identity(provider_id, full_directory)
         build_config.set_location(plugin_provider, name, directory)
       end
     end
-    ui.success("Build of identity #{blue(name)} finished") if success
+    success("Build of identity #{blue(name)} finished", { :i18n => false }) if success
     success
   end
 end

data/lib/CORL/builder/package.rb

@@ -37,7 +37,7 @@ class Package < CORL.plugin_class(:CORL, :builder)
     directory   = File.join(internal_path(build_directory), provider_id.to_s)
     success     = true
       
-    ui.info("Building package #{blue(name)} at #{purple(project_reference)} into #{green(directory)}")
+    info("Building package #{blue(name)} at #{purple(project_reference)} into #{green(directory)}", { :i18n => false })
       
     full_directory = File.join(network.directory, directory)
       
@@ -49,7 +49,7 @@ class Package < CORL.plugin_class(:CORL, :builder)
         :manage_ignore => false
       }))
       unless project
-        ui.warn("Package #{cyan(name)} failed to initialize")
+        warn("Package #{cyan(name)} failed to initialize", { :i18n => false })
         success = false
       end
            
@@ -67,7 +67,7 @@ class Package < CORL.plugin_class(:CORL, :builder)
         end
       end
     end
-    ui.success("Build of package #{blue(name)} finished") if success
+    success("Build of package #{blue(name)} finished", { :i18n => false }) if success
     success
   end
 end

data/lib/CORL/configuration/file.rb

@@ -37,7 +37,10 @@ class File < CORL.plugin_class(:CORL, :configuration)
   # Configuration loading / saving
     
   def load(options = {})
-    super do |method_config, properties|
+    super do |method_config, properties|      
+      success = true
+      
+      myself.status = code.success
       
       generate_routes = lambda do |config_name, file_properties, parents = []|
         file_properties.each do |name, value|
@@ -62,15 +65,26 @@ class File < CORL.plugin_class(:CORL, :configuration)
           raw    = Util::Disk.read(file)    
         
           if parser && raw && ! raw.empty?
-            logger.debug("Source configuration file contents: #{raw}")            
-            parse_properties = parser.parse(raw)
+            logger.debug("Source configuration file contents: #{raw}")
             
-            generate_routes.call(config_name, parse_properties)
-            properties.import(parse_properties)
+            begin            
+              parse_properties = parser.parse(raw)
+              
+              generate_routes.call(config_name, parse_properties)
+              properties.import(parse_properties)
+            
+            rescue => error
+              ui_group(file) do
+                error(error.message.sub(/^[^\:]+\:\s+/, ''), { :i18n => false })
+              end
+              myself.status = 255
+              success       = false
+            end            
           end
           CORL.remove_plugin(parser) if parser         
         end
       end
+      success
     end
   end
    
@@ -235,7 +249,7 @@ class File < CORL.plugin_class(:CORL, :configuration)
         FileUtils.mkdir_p(attach_path) unless Dir.exists?(attach_path)
       
       rescue => error
-        alert(error.message)
+        warn(error.message, { :i18n => false })
         success = false
       end
       
@@ -259,7 +273,7 @@ class File < CORL.plugin_class(:CORL, :configuration)
             FileUtils.cp(file, new_file)
           
           rescue => error
-            alert(error.message)
+            warn(error.message, { :i18n => false })
             success = false
           end  
         end

data/lib/CORL/machine/vagrant.rb

@@ -177,7 +177,7 @@ class Vagrant < CORL.plugin_class(:CORL, :machine)
         end
         
       rescue => error
-        ui.error(error.message)
+        error(error.message, { :i18n => false })
         success = false
       end
       
@@ -306,8 +306,8 @@ class Vagrant < CORL.plugin_class(:CORL, :machine)
         server.send(:action, action.to_sym, params)
         
       rescue => error
-        ui.error(error)
-        ui.error(Util::Data.to_yaml(error.backtrace))
+        error(error, { :i18n => false })
+        error(Util::Data.to_yaml(error.backtrace), { :i18n => false })
         success = false
       end      
     end

data/lib/CORL/node/vagrant.rb

@@ -223,15 +223,12 @@ class Vagrant < CORL.plugin_class(:CORL, :node)
   #---
   
   def filter_output(type, data)
+    data = super
+    
     if type == :error
       if data.include?('stdin: is not a tty') || data.include?('unable to re-open stdin')
         data = ''  
       end
-    elsif type == :output
-      # Hide redundant Facter output
-      if data =~ /^Already evaluated [a-z]+ at [^,]+, reevaluating anyways$/
-        data = ''
-      end  
     end
     data  
   end

data/lib/CORL/provisioner/puppetnode.rb

@@ -142,7 +142,7 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
       directory  = File.join(internal_path(build_directory), package_id.to_s, name.to_s)
       success    = true
         
-      ui.info("Building CORL profile #{blue(name)} modules into #{green(directory)}")
+      info("Building CORL profile #{blue(name)} modules into #{green(directory)}", { :i18n => false })
     
       if processed_info.has_key?(:modules)
         status  = parallel(:build_module, hash(processed_info[:modules]), directory, name, environment)
@@ -150,7 +150,7 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
         
         build_config.set_location(:puppet_module, profile_id(package, name), directory) if success
       end
-      ui.success("Build of profile #{blue(name)} finished") if success
+      success("Build of profile #{blue(name)} finished", { :i18n => false }) if success
       success
     end
   end
@@ -161,7 +161,7 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
     module_project        = nil
     success               = true
             
-    ui.info("Building #{blue(profile)} Puppet module #{blue(name)} at #{purple(project_reference)} into #{green(module_directory)}")
+    info("Building #{blue(profile)} Puppet module #{blue(name)} at #{purple(project_reference)} into #{green(module_directory)}", { :i18n => false })
     
     module_project = build_config.manage(:project, extended_config(:puppet_module, {
       :directory     => full_module_directory,
@@ -172,10 +172,10 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
       :manage_ignore => false
     }))
     unless module_project
-      ui.warn("Puppet module #{cyan(name)} failed to initialize")
+      warn("Puppet module #{cyan(name)} failed to initialize", { :i18n => false })
       success = false
     end
-    ui.success("Build of #{blue(profile)} #{blue(name)} finished") if success
+    success("Build of #{blue(profile)} #{blue(name)} finished", { :i18n => false }) if success
     success
   end
   
@@ -256,7 +256,7 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
       
       @@puppet_lock.synchronize do
         begin
-          ui.info("Starting catalog generation")
+          info("Starting catalog generation", { :i18n => false })
           
           @@status[id] = code.success
           @@network    = network    
@@ -292,8 +292,8 @@ class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
             catalog.retrieval_duration = Time.now - start_time
             
             unless config.get(:dry_run, false)
-              ui.info("\n", { :prefix => false })
-              ui.info("Starting configuration run")
+              info("\n", { :prefix => false, :i18n => false })
+              info("Starting configuration run", { :i18n => false })
               
               # Configure the machine
               configurer = Puppet::Configurer.new

data/lib/core/facade.rb

@@ -10,8 +10,10 @@ module Facade
   def facts(reset = false)
     if reset || @@facts.empty?
       @@facts = {} if reset
-      Facter.list.each do |name|
-        @@facts[name] = Facter.value(name)
+      silence do
+        Facter.list.each do |name|
+          @@facts[name] = Facter.value(name)
+        end
       end
     end
     @@facts
@@ -29,7 +31,9 @@ module Facade
   #---
   
   def fact(name)
-    Facter.value(name)
+    silence do
+      Facter.value(name)
+    end
   end
   
   #-----------------------------------------------------------------------------

data/lib/core/mixin/action/keypair.rb

@@ -85,9 +85,9 @@ module Keypair
       else
         key_options = {}
         if settings[:require_password]
-          password = ui.password('SSH')
-          if password
-            key_options[:passphrase] = password
+          key_password = password('SSH')
+          if key_password
+            key_options[:passphrase] = key_password
           else
             warn('corl.core.mixin.action.keypair.errors.no_password')
             return nil

data/lib/core/mixin/action/registration.rb

@@ -0,0 +1,31 @@
+
+module CORL
+module Mixin
+module Action
+module Registration
+        
+  #-----------------------------------------------------------------------------
+  # Options
+    
+  def register_node(name, default = nil)
+    name = name.to_sym
+    
+    register name, :str, default do |value|
+      validate_plugins(:CORL, :node, name, value)
+    end
+  end
+  
+  #---
+    
+  def register_nodes(name, default = nil)
+    name = name.to_sym
+    
+    register name, :array, default do |values|
+      validate_plugins(:CORL, :node, name, values)
+    end
+  end
+end
+end
+end
+end
+

data/lib/core/mixin/lookup.rb

@@ -26,9 +26,37 @@ module Lookup
   
   #---
   
-  def create_fact(name, value, reset = false)
+  def create_facts(data, reset = false)
     facts(reset, false)
-    fact_var[name.to_sym] = value
+    
+    data = hash(data)    
+    data.each do |name, value|
+      fact_var[name.to_sym] = value
+    end
+    create_facts_post(fact_var.clone, data.keys)
+  end
+  
+  def create_facts_post(data, names)
+    data
+  end
+  
+  #---
+  
+  def delete_facts(names, reset = false)
+    facts(reset, false)
+    
+    names = [ names ] unless names.is_a?(Array)
+    data  = {}
+    
+    names.each do |name|
+      name       = name.to_sym
+      data[name] = fact_var.delete(name)
+    end
+    delete_facts_post(fact_var.clone, data)
+  end
+  
+  def delete_facts_post(data, old_data)
+    data  
   end
   
   #---
@@ -75,6 +103,11 @@ module Lookup
     if CORL.admin? && config_file && File.exist?(config_file)
       config = Hiera::Config.load(config_file)
     end
+        
+    # Need some way to tell if we have installed our own Hiera configuration.
+    # TODO: Figure something else out.  This is bad.
+    config = {} if config[:merge_behavior] == :native
+    
     config[:logger] = :corl
     
     unless config[:merge_behavior]
@@ -114,6 +147,11 @@ module Lookup
     unless hiera_config[:hierarchy].include?('common')
       hiera_config[:hierarchy] << 'common'
     end
+    
+    hiera_config[:hierarchy].each_with_index do |path, index|
+      hiera_config[:hierarchy][index] = path.gsub('//', '/')
+    end
+    
     hiera_config.export
   end
   
@@ -143,7 +181,7 @@ module Lookup
   
   #---
     
-  def lookup(properties, default = nil, options = {})
+  def lookup_base(properties, default = nil, options = {})
     config      = Config.new(Config.ensure(options).export)
     value       = nil
     
@@ -218,11 +256,17 @@ module Lookup
     CORL.ui.info("\n", { :prefix => false }) if debug
     value
   end
+  
+  #---
+  
+  def lookup(properties, default = nil, options = {})
+    lookup_base(properties, default, options)
+  end
     
   #---
   
   def lookup_array(properties, default = [], options = {})
-    config          = Config.ensure(options) 
+    config          = Config.ensure(options).defaults({ :basic => false }) 
     value, property = lookup(properties, nil, config.import({ :return_property => true, :context => :array }))
      
     if Util::Data.undef?(value)
@@ -251,7 +295,7 @@ module Lookup
   #---
   
   def lookup_hash(properties, default = {}, options = {})
-    config          = Config.ensure(options) 
+    config          = Config.ensure(options).defaults({ :basic => false }) 
     value, property = lookup(properties, nil, config.import({ :return_property => true, :context => :hash }))
     
     if Util::Data.undef?(value)
@@ -280,7 +324,7 @@ module Lookup
   #---
 
   def normalize(data, override = nil, options = {})
-    config  = Config.ensure(options).import({ :context => :hash })
+    config  = Config.ensure(options).import({ :context => :hash }).defaults({ :basic => false })
     results = {}
     
     unless Util::Data.undef?(override)