corl 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f29a3e15157033eb15220fec258f5dab7c864f
-  data.tar.gz: eedf1f77dd5ceb8a0bec1e3ee8051c36e2d52250
+  metadata.gz: 3840ed0b53491146d0b010ac91c9e262b9ccd25f
+  data.tar.gz: 417a4965b14c57eb2a681240675e010ac46ea29c
 SHA512:
-  metadata.gz: 7f81cf183feae8f4b102389f115da4549c50f2fe6da18fa5db9e690a72b498de16689f634d0d5f2dfaec3c584afe188b5e45cfe9c92aa06b505fd66473a7be73
-  data.tar.gz: 3bce3004dc717b56ad801f1f6549aad4254d9a9374d273b81c37145cc04f8bf355ddd28048300dd8d551dac92a8de13698475481c2ca96f094b014810914cf03
+  metadata.gz: 9586034c27a82e8d560a7fcd1b3b36f80683303adecf0f63dd78b4a8dfbf9ecac9cd5c9a565cb34320e356f6f1c95bf58588f51d0eccfba15526ea4f6b19ed2f
+  data.tar.gz: d64b068925770fd9f5fd02da6fe7ac5149cdc88e68d181626c92a4011615c70f52d6c4216787a40b1fc6c757451bff412056421f5d8ca017af49b2c805a1650f

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "nucleon", "~> 0.2", ">= 0.2.0", :github => 'coralnexus/nucleon', :branch => '0.2'
+gem "nucleon", "~> 0.2", ">= 0.2.2", :github => 'coralnexus/nucleon', :branch => '0.2'
 
 gem "fog", "~> 1.20"
 gem "unf", "~> 0.1"

data/Gemfile.lock

@@ -1,12 +1,14 @@
 GIT
   remote: git://github.com/coralnexus/nucleon.git
-  revision: b1aa31328f2aa1a681134d8ff88ea1639c18432c
+  revision: 2c89c3aa92950bec4f6d364ff7a5b528190677b8
   branch: 0.2
   specs:
-    nucleon (0.2.0)
+    nucleon (0.2.2)
       celluloid (~> 0.15)
       childprocess (~> 0.5)
       deep_merge (~> 1.0)
+      erubis (~> 2.7)
+      highline (~> 1.6)
       i18n (~> 0.6)
       log4r (~> 1.1)
       multi_json (~> 1.7)
@@ -36,11 +38,11 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.5.1)
+    corl (0.5.2)
       facter (~> 2.1)
       fog (~> 1.20)
       hiera (~> 1.3)
-      nucleon (~> 0.2, >= 0.2.0)
+      nucleon (~> 0.2, >= 0.2.2)
       puppet (~> 3.6)
       unf (~> 0.1)
 
@@ -178,7 +180,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rubyntlm (0.1.1)
-    rugged (0.19.0)
+    rugged (0.21.0)
     savon (0.9.5)
       akami (~> 1.0)
       builder (>= 2.1.2)
@@ -220,7 +222,7 @@ DEPENDENCIES
   fog (~> 1.20)
   hiera (~> 1.3)
   jeweler (~> 2.0)
-  nucleon (~> 0.2, >= 0.2.0)!
+  nucleon (~> 0.2, >= 0.2.2)!
   puppet (~> 3.6)
   rdoc (~> 3.12)
   rspec (~> 2.10)

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/bootstrap/os/ubuntu/00_base.sh

@@ -11,8 +11,8 @@ echo "127.0.1.1 $HOSTNAME" >> /etc/hosts || exit 2
 echo "nameserver 208.67.222.222" | tee /etc/resolvconf/resolv.conf.d/base > /dev/null || exit 3
 
 # Update system packages
-apt-get update || exit 4
-apt-get -y upgrade || exit 5
+apt-get -y install dialog || exit 4
+apt-get update || exit 5
 
 # Install basic build packages.
 apt-get -y install build-essential cmake bindfs libnl-dev libpopt-dev libssl-dev libcurl4-openssl-dev libxslt-dev libxml2-dev || exit 6

data/bootstrap/os/ubuntu/05_ruby.sh

@@ -2,10 +2,22 @@
 #-------------------------------------------------------------------------------
 
 # Install Ruby.
-apt-get -y install ruby1.9.1 ruby1.9.1-dev || exit 50
+case "$OS_VERSION" in
+'14.04')
+    apt-get -y install ruby1.9.1 ruby1.9.1-dev || exit 50
+;;
+'12.04')
+    add-apt-repository -y ppa:brightbox/ruby-ng-experimental 2>&1 || exit 51
+    apt-get update || exit 52
+
+    apt-get -y install ruby2.0 ruby2.0-dev || exit 53
+    update-alternatives --set ruby /usr/bin/ruby2.0 || exit 54
+    update-alternatives --set gem /usr/bin/gem2.0 || exit 55
+;;
+esac
 
 # Set Gem options
 ( cat <<'EOP'
 gem: --no-rdoc --no-ri 
 EOP
-) > "$HOME/.gemrc" || exit 51
+) > "$HOME/.gemrc" || exit 56

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-07-10"
+  s.date = "2014-08-10"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -104,6 +104,7 @@ Gem::Specification.new do |s|
     "lib/nucleon/action/cloud/inspect.rb",
     "lib/nucleon/action/cloud/machines.rb",
     "lib/nucleon/action/cloud/regions.rb",
+    "lib/nucleon/action/cloud/remote.rb",
     "lib/nucleon/action/cloud/settings.rb",
     "lib/nucleon/action/cloud/vagrantfile.rb",
     "lib/nucleon/action/node/IP.rb",
@@ -135,6 +136,7 @@ Gem::Specification.new do |s|
     "lib/nucleon/action/plugin/template/nucleon.action.erb",
     "lib/nucleon/action/plugins.rb",
     "lib/nucleon/event/puppet.rb",
+    "lib/nucleon/extension/corl_config.rb",
     "lib/nucleon/template/environment.rb",
     "lib/puppet/indirector/corl.rb",
     "lib/puppet/indirector/data_binding/corl.rb",
@@ -461,6 +463,174 @@ Gem::Specification.new do |s|
     "rdoc/site/0.5.0/js/searcher.js",
     "rdoc/site/0.5.0/rdoc.css",
     "rdoc/site/0.5.0/table_of_contents.html",
+    "rdoc/site/0.5.1/CORL.html",
+    "rdoc/site/0.5.1/CORL/Build.html",
+    "rdoc/site/0.5.1/CORL/Builder.html",
+    "rdoc/site/0.5.1/CORL/Builder/Identity.html",
+    "rdoc/site/0.5.1/CORL/Builder/Package.html",
+    "rdoc/site/0.5.1/CORL/Configuration.html",
+    "rdoc/site/0.5.1/CORL/Configuration/File.html",
+    "rdoc/site/0.5.1/CORL/Errors.html",
+    "rdoc/site/0.5.1/CORL/Facade.html",
+    "rdoc/site/0.5.1/CORL/Machine.html",
+    "rdoc/site/0.5.1/CORL/Machine/AWS.html",
+    "rdoc/site/0.5.1/CORL/Machine/Fog.html",
+    "rdoc/site/0.5.1/CORL/Machine/Physical.html",
+    "rdoc/site/0.5.1/CORL/Machine/Rackspace.html",
+    "rdoc/site/0.5.1/CORL/Machine/Vagrant.html",
+    "rdoc/site/0.5.1/CORL/Mixin.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Action.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Action/Keypair.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Action/Registration.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Builder.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Builder/Global.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Builder/Instance.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Lookup.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Machine.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Machine/SSH.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Macro.html",
+    "rdoc/site/0.5.1/CORL/Mixin/Macro/NetworkSettings.html",
+    "rdoc/site/0.5.1/CORL/Network.html",
+    "rdoc/site/0.5.1/CORL/Network/CORL.html",
+    "rdoc/site/0.5.1/CORL/Node.html",
+    "rdoc/site/0.5.1/CORL/Node/AWS.html",
+    "rdoc/site/0.5.1/CORL/Node/Fog.html",
+    "rdoc/site/0.5.1/CORL/Node/Local.html",
+    "rdoc/site/0.5.1/CORL/Node/Rackspace.html",
+    "rdoc/site/0.5.1/CORL/Node/Vagrant.html",
+    "rdoc/site/0.5.1/CORL/Plugin.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Builder.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Configuration.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Machine.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Network.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Node.html",
+    "rdoc/site/0.5.1/CORL/Plugin/Provisioner.html",
+    "rdoc/site/0.5.1/CORL/Provisioner.html",
+    "rdoc/site/0.5.1/CORL/Provisioner/Puppetnode.html",
+    "rdoc/site/0.5.1/CORL/Util.html",
+    "rdoc/site/0.5.1/CORL/Util/Puppet.html",
+    "rdoc/site/0.5.1/CORL/Util/Puppet/Resource.html",
+    "rdoc/site/0.5.1/CORL/Util/Puppet/ResourceGroup.html",
+    "rdoc/site/0.5.1/CORL/Vagrant.html",
+    "rdoc/site/0.5.1/CORL/Vagrant/Config.html",
+    "rdoc/site/0.5.1/Fog.html",
+    "rdoc/site/0.5.1/Fog/Compute.html",
+    "rdoc/site/0.5.1/Fog/Compute/AWS.html",
+    "rdoc/site/0.5.1/Fog/Compute/AWS/Server.html",
+    "rdoc/site/0.5.1/Fog/Compute/RackspaceV2.html",
+    "rdoc/site/0.5.1/Fog/Compute/RackspaceV2/Server.html",
+    "rdoc/site/0.5.1/Hiera.html",
+    "rdoc/site/0.5.1/Hiera/Backend.html",
+    "rdoc/site/0.5.1/Hiera/Corl_logger.html",
+    "rdoc/site/0.5.1/Nucleon.html",
+    "rdoc/site/0.5.1/Nucleon/Action.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Config.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Create.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Images.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Inspect.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Machines.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Regions.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Settings.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Cloud/Vagrantfile.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Authorize.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Bootstrap.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Build.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Cache.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Destroy.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Exec.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Fact.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Facts.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Group.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Groups.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/IP.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Identity.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Image.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Keypair.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Lookup.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Provision.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Reboot.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Revoke.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/SSH.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Seed.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Spawn.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Start.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Status.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Node/Stop.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Plugin.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Plugin/Create.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Plugin/List.html",
+    "rdoc/site/0.5.1/Nucleon/Action/Plugins.html",
+    "rdoc/site/0.5.1/Nucleon/Config.html",
+    "rdoc/site/0.5.1/Nucleon/Event.html",
+    "rdoc/site/0.5.1/Nucleon/Event/Puppet.html",
+    "rdoc/site/0.5.1/Nucleon/Plugin.html",
+    "rdoc/site/0.5.1/Nucleon/Plugin/Base.html",
+    "rdoc/site/0.5.1/Nucleon/Plugin/CloudAction.html",
+    "rdoc/site/0.5.1/Nucleon/Template.html",
+    "rdoc/site/0.5.1/Nucleon/Template/Environment.html",
+    "rdoc/site/0.5.1/Object.html",
+    "rdoc/site/0.5.1/Puppet.html",
+    "rdoc/site/0.5.1/Puppet/DataBinding.html",
+    "rdoc/site/0.5.1/Puppet/DataBinding/Corl.html",
+    "rdoc/site/0.5.1/Puppet/Indirector.html",
+    "rdoc/site/0.5.1/Puppet/Indirector/Corl.html",
+    "rdoc/site/0.5.1/Puppet/Parser.html",
+    "rdoc/site/0.5.1/Puppet/Parser/Functions.html",
+    "rdoc/site/0.5.1/README_rdoc.html",
+    "rdoc/site/0.5.1/Vagrant.html",
+    "rdoc/site/0.5.1/Vagrant/Config.html",
+    "rdoc/site/0.5.1/Vagrant/Config/Loader.html",
+    "rdoc/site/0.5.1/Vagrant/Vagrantfile.html",
+    "rdoc/site/0.5.1/VagrantPlugins.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Action.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Action/DeleteCache.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Action/InitKeys.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Action/LinkNetwork.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/BaseAction.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Command.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Command/Launcher.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Config.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Config/CORL.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Plugin.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Provisioner.html",
+    "rdoc/site/0.5.1/VagrantPlugins/CORL/Provisioner/CORL.html",
+    "rdoc/site/0.5.1/created.rid",
+    "rdoc/site/0.5.1/images/add.png",
+    "rdoc/site/0.5.1/images/brick.png",
+    "rdoc/site/0.5.1/images/brick_link.png",
+    "rdoc/site/0.5.1/images/bug.png",
+    "rdoc/site/0.5.1/images/bullet_black.png",
+    "rdoc/site/0.5.1/images/bullet_toggle_minus.png",
+    "rdoc/site/0.5.1/images/bullet_toggle_plus.png",
+    "rdoc/site/0.5.1/images/date.png",
+    "rdoc/site/0.5.1/images/delete.png",
+    "rdoc/site/0.5.1/images/find.png",
+    "rdoc/site/0.5.1/images/loadingAnimation.gif",
+    "rdoc/site/0.5.1/images/macFFBgHack.png",
+    "rdoc/site/0.5.1/images/package.png",
+    "rdoc/site/0.5.1/images/page_green.png",
+    "rdoc/site/0.5.1/images/page_white_text.png",
+    "rdoc/site/0.5.1/images/page_white_width.png",
+    "rdoc/site/0.5.1/images/plugin.png",
+    "rdoc/site/0.5.1/images/ruby.png",
+    "rdoc/site/0.5.1/images/tag_blue.png",
+    "rdoc/site/0.5.1/images/tag_green.png",
+    "rdoc/site/0.5.1/images/transparent.png",
+    "rdoc/site/0.5.1/images/wrench.png",
+    "rdoc/site/0.5.1/images/wrench_orange.png",
+    "rdoc/site/0.5.1/images/zoom.png",
+    "rdoc/site/0.5.1/index.html",
+    "rdoc/site/0.5.1/js/darkfish.js",
+    "rdoc/site/0.5.1/js/jquery.js",
+    "rdoc/site/0.5.1/js/navigation.js",
+    "rdoc/site/0.5.1/js/search.js",
+    "rdoc/site/0.5.1/js/search_index.js",
+    "rdoc/site/0.5.1/js/searcher.js",
+    "rdoc/site/0.5.1/rdoc.css",
+    "rdoc/site/0.5.1/table_of_contents.html",
     "spec/corl_mock_input.rb",
     "spec/corl_test_kernel.rb",
     "spec/spec_helper.rb"
@@ -478,7 +648,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nucleon>, [">= 0.2.0", "~> 0.2"])
+      s.add_runtime_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
       s.add_runtime_dependency(%q<fog>, ["~> 1.20"])
       s.add_runtime_dependency(%q<unf>, ["~> 0.1"])
       s.add_runtime_dependency(%q<facter>, ["~> 2.1"])
@@ -491,7 +661,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<vagrant>, ["~> 1.5"])
     else
-      s.add_dependency(%q<nucleon>, [">= 0.2.0", "~> 0.2"])
+      s.add_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
       s.add_dependency(%q<fog>, ["~> 1.20"])
       s.add_dependency(%q<unf>, ["~> 0.1"])
       s.add_dependency(%q<facter>, ["~> 2.1"])
@@ -505,7 +675,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<vagrant>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<nucleon>, [">= 0.2.0", "~> 0.2"])
+    s.add_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
     s.add_dependency(%q<fog>, ["~> 1.20"])
     s.add_dependency(%q<unf>, ["~> 0.1"])
     s.add_dependency(%q<facter>, ["~> 2.1"])

data/lib/CORL/builder/identity.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Builder
-class Identity < CORL.plugin_class(:CORL, :builder)
+class Identity < Nucleon.plugin_class(:CORL, :builder)
    
   #-----------------------------------------------------------------------------
   # Identity plugin interface

data/lib/CORL/builder/package.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Builder
-class Package < CORL.plugin_class(:CORL, :builder)
+class Package < Nucleon.plugin_class(:CORL, :builder)
   
   #-----------------------------------------------------------------------------
   # Package plugin interface

data/lib/CORL/configuration/file.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Configuration
-class File < CORL.plugin_class(:CORL, :configuration)
+class File < Nucleon.plugin_class(:CORL, :configuration)
 
   #-----------------------------------------------------------------------------
   # Configuration plugin interface
@@ -62,8 +62,8 @@ class File < CORL.plugin_class(:CORL, :configuration)
           logger.info("Loading #{provider} translated source configuration from #{file}")
           
           parser = CORL.translator(method_config, provider)
-          raw    = Util::Disk.read(file)    
-        
+          raw    = Util::Disk.read(file)
+          
           if parser && raw && ! raw.empty?
             logger.debug("Source configuration file contents: #{raw}")
             
@@ -134,15 +134,9 @@ class File < CORL.plugin_class(:CORL, :configuration)
             config_name = select_largest(local_router)
             file_data.set([ config_name, keys ].flatten, value)  
           else
-            # Router is non existent
-            if config_name = select_largest(router.export)
-              # Pick largest router from top level
-              file_data.set([ config_name, keys ].flatten, value)
-            else
-              # Resort to sane defaults
-              config_name = "corl.#{default_provider}"
-              file_data.set([ config_name, keys ].flatten, value)
-            end      
+            # Router is non existent.  Resort to easily found default
+            config_name = "corl.#{default_provider}"
+            file_data.set([ config_name, keys ].flatten, value)      
           end
         end        
       end
@@ -333,7 +327,7 @@ class File < CORL.plugin_class(:CORL, :configuration)
       search.clear
     else
       translators = CORL.loaded_plugins(:nucleon, :translator)
-      file_bases  = [ "corl", extension_collect(:base) ].flatten
+      file_bases  = [ :corl, extension_set(:base, []) ].flatten.uniq
       
       project.localize do
         translators.each do |provider, info|

data/lib/CORL/machine/physical.rb

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

data/lib/CORL/machine/vagrant.rb

@@ -1,14 +1,22 @@
 
 module CORL
 module Machine
-class Vagrant < CORL.plugin_class(:CORL, :machine)
+class Vagrant < Nucleon.plugin_class(:CORL, :machine)
   
   include Mixin::Machine::SSH
   
   #---
   
   @@lock = Mutex.new
-    
+
+  #-----------------------------------------------------------------------------
+  # Machine plugin interface
+  
+  def normalize(reload)
+    super
+    myself.plugin_name = node.plugin_name if node
+  end
+     
   #-----------------------------------------------------------------------------
   # Checks
   
@@ -281,7 +289,7 @@ class Vagrant < CORL.plugin_class(:CORL, :machine)
     if server
       load
       success = run(:up, options)
-        
+      
       # Make sure provisioner changes (key changes) are accounted for
       # TODO: Is there a better way?
       load if success
@@ -306,7 +314,7 @@ class Vagrant < CORL.plugin_class(:CORL, :machine)
         server.send(:action, action.to_sym, params)
         
       rescue => error
-        error(error, { :i18n => false })
+        error(error.message, { :i18n => false })
         error(Util::Data.to_yaml(error.backtrace), { :i18n => false })
         success = false
       end      

data/lib/CORL/network/CORL.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Network
-class CORL < CORL.plugin_class(:CORL, :network)
+class CORL < Nucleon.plugin_class(:CORL, :network)
  
   #-----------------------------------------------------------------------------
   # Cloud plugin interface

data/lib/CORL/node/AWS.rb

@@ -8,6 +8,18 @@ class AWS < Fog
   
   def normalize(reload)
     super do
+      region_info.import({
+        'us-east-1'      => 'US East       -- North Virginia', 
+        'us-west-1'      => 'US West       -- North California', 
+        'us-west-2'      => 'US West       -- Oregon',
+        'eu-west-1'      => 'EU            -- Ireland',
+        'ap-northeast-1' => 'Asia Pacific  -- Tokyo', 
+        'ap-southeast-1' => 'Asia Pacific  -- Singapore', 
+        'ap-southeast-2' => 'Asia Pacific  -- Sydney',       
+        'sa-east-1'      => 'South America -- Sao Paulo'
+      })
+      
+      # Return machine provider      
       :aws
     end
   end
@@ -21,20 +33,7 @@ class AWS < Fog
   
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
-  def regions
-    [
-      'us-east-1', 
-      'us-west-1', 
-      'us-west-2',
-      'eu-west-1',
-      'ap-northeast-1', 
-      'ap-southeast-1', 
-      'ap-southeast-2',       
-      'sa-east-1'
-    ]
-  end
-  
+    
   #-----------------------------------------------------------------------------
   # Settings groups
     
@@ -42,7 +41,7 @@ class AWS < Fog
     super do |config|
       config.import({ 
         :provider => 'AWS',
-        :region   => region
+        :region   => region.to_s
       })
     
       config[:aws_access_key_id]     = api_user if api_user
@@ -81,21 +80,24 @@ class AWS < Fog
   # Utilities
   
   def render_machine_type(machine_type)
-    sprintf("[  %20s  ][ VCPUS: %5.1f ] %-40s ( RAM: %6iMB | DISK: %8iGB )  ( BITS: %2i )", 
-      machine_type_id(machine_type), 
-      machine_type.cores, 
-      machine_type.name, 
-      machine_type.ram, 
-      machine_type.disk, 
-      machine_type.bits
+    sprintf("%-25s   %-50s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %8sGB )  ( BITS: %5s )", 
+      purple(machine_type_id(machine_type)),
+      yellow(machine_type.name), 
+      blue(machine_type.cores.to_s),       
+      blue(machine_type.ram.to_s), 
+      blue(machine_type.disk.to_s), 
+      blue(machine_type.bits.to_s)
     )
   end
   
   #---
   
   def render_image(image)
+    description = image.name
+    description = image.description if image.description && ! image.description.empty?
+    
     location = image.location.split('/').first
-    sprintf("[  %20s  ][ %10s ] %10s - %s (%s)", image_id(image), image.state, image.architecture, image.name, location)
+    sprintf("%-23s [ %-10s | %-6s ]   %s ( %s )", purple(image_id(image)), blue(image.state), image.architecture, yellow(description), cyan(location))
   end
   
   #---

data/lib/CORL/node/local.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Node
-class Local < CORL.plugin_class(:CORL, :node)
+class Local < Nucleon.plugin_class(:CORL, :node)
  
   #-----------------------------------------------------------------------------
   # Node plugin interface

data/lib/CORL/node/rackspace.rb

@@ -8,6 +8,12 @@ class Rackspace < Fog
   
   def normalize(reload)
     super do
+      region_info.import({
+        :dfw => 'Dallas',
+        :ord => 'Chicago',
+        :lon => 'London (for UK accounts)'  
+      })
+      # Return machine provider
       :rackspace
     end
   end
@@ -22,14 +28,6 @@ class Rackspace < Fog
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
   
-  def regions
-    [ 
-      :dfw, # Dallas
-      :ord, # Chicago
-      :lon  # London (for UK accounts)
-    ]
-  end
- 
   #-----------------------------------------------------------------------------
   # Settings groups
     
@@ -78,19 +76,19 @@ class Rackspace < Fog
   # Utilities
   
   def render_machine_type(machine_type)
-    sprintf("[  %20s  ][ VCPUS: %2i ] %-30s ( RAM: %6iMB | DISK: %4iGB )", 
-      machine_type_id(machine_type), 
-      machine_type.vcpus, 
-      machine_type.name, 
-      machine_type.ram, 
-      machine_type.disk
+    sprintf("%-30s  %-35s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %4sGB )", 
+      purple(machine_type_id(machine_type)),
+      yellow(machine_type.name), 
+      blue(machine_type.vcpus.to_s),       
+      blue(machine_type.ram.to_s), 
+      blue(machine_type.disk.to_s)
     )
   end
   
   #---
   
   def render_image(image)
-    sprintf("[  %40s  ][ %10s ] %s", image_id(image), image.state, image.name)
+    sprintf("%-47s [ %-10s ]   %s", purple(image_id(image)), blue(image.state), yellow(image.name))
   end
   
   #---

data/lib/CORL/node/vagrant.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Node
-class Vagrant < CORL.plugin_class(:CORL, :node)
+class Vagrant < Nucleon.plugin_class(:CORL, :node)
  
   #-----------------------------------------------------------------------------
   # Node plugin interface

data/lib/CORL/provisioner/puppetnode.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Provisioner
-class Puppetnode < CORL.plugin_class(:CORL, :provisioner)
+class Puppetnode < Nucleon.plugin_class(:CORL, :provisioner)
   
   @@puppet_lock = Mutex.new