corl 0.4.0 → 0.4.1

data/lib/{corl_core → core}/plugin/provisioner.rb

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

data/lib/{corl_core → core}/util/ssh.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Util
-class SSH < Core
+class SSH < Nucleon::Core
   
   #-----------------------------------------------------------------------------
   # User key home

data/lib/corl.rb

@@ -1,103 +1,42 @@
 
 #*******************************************************************************
-# CORL Core Library
+# CORL (Cluster Orchestration and Research Library)
 #
-# This provides core data elements and utilities used in the CORL gems.
+# built on Nucleon (github.com/coralnexus/nucleon)
+#
+# A framework that provides a simple foundation for growing organically in 
+# the cloud.
 #
 # Author::    Adrian Webb (mailto:adrian.webb@coralnexus.com)
 # License::   GPLv3
 
-#-------------------------------------------------------------------------------
-# Global namespace
-
-module Kernel
-   
-  def dbg(data, label = '')
-    # Invocations of this function should NOT be committed to the project
-    require 'pp'
-    
-    puts '>>----------------------'
-    unless label.empty?
-      puts label
-      puts '---'
-    end
-    pp data
-    puts '<<'
-  end
-  
-  #---  
-    
-  def corl_locate(command)
-    command = command.to_s
-    exts    = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each do |ext|
-        exe = File.join(path, "#{command}#{ext}")
-        return exe if File.executable?(exe)
-      end
-    end
-    return nil
-  end
-    
-  #---
-  
-  def corl_require(base_dir, name)
-    name = name.to_s
-    top_level_file = File.join(base_dir, "#{name}.rb")
-    
-    require top_level_file if File.exists?(top_level_file) 
-     
-    directory = File.join(base_dir, name)
-      
-    if File.directory?(directory)
-      Dir.glob(File.join(directory, '**', '*.rb')).each do |sub_file|
-        require sub_file
-      end
-    end  
-  end
-end
-
 #-------------------------------------------------------------------------------
 # Top level properties 
 
 lib_dir          = File.dirname(__FILE__)
-core_dir         = File.join(lib_dir, 'corl_core')
+core_dir         = File.join(lib_dir, 'core')
 mixin_dir        = File.join(core_dir, 'mixin')
-mixin_config_dir = File.join(mixin_dir, 'config')
 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')
-plugin_dir       = File.join(core_dir, 'plugin')
  
 #-------------------------------------------------------------------------------
 # CORL requirements
 
-git_location = corl_locate('git')
-
 $:.unshift(lib_dir) unless $:.include?(lib_dir) || $:.include?(File.expand_path(lib_dir))
 
 #---
   
 require 'rubygems'
 
-require 'pp'
-require 'i18n'
-require 'log4r'
-require 'log4r/configurator'
-require 'base64'
+require 'nucleon_base'
+CORL = Nucleon
+
+require 'tmpdir'
 require 'sshkey'
-require 'deep_merge'
+
 require 'hiera'
 require 'facter'
-require 'yaml'
-require 'multi_json'
-require 'digest/sha1'
-require 'optparse'
-require 'thread' # Eventually depreciated
-require 'celluloid'
-require 'celluloid/autostart'
-require 'tmpdir'
 
 #---
 
@@ -108,13 +47,6 @@ I18n.load_path << File.expand_path(File.join('..', 'locales', 'en.yml'), lib_dir
 
 #---
 
-if git_location
-  require 'grit'
-  corl_require(util_dir, :git)
-end
-
-#---
-
 # Object modifications (100% pure monkey patches)
 Dir.glob(File.join(mod_dir, '*.rb')).each do |file|
   require file
@@ -126,48 +58,57 @@ end
 Dir.glob(File.join(mixin_dir, '*.rb')).each do |file|
   require file
 end
-Dir.glob(File.join(mixin_config_dir, '*.rb')).each do |file|
-  require file
-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 bootstrap classes
-corl_require(core_dir, :errors)
-corl_require(core_dir, :codes)
-corl_require(util_dir, :data)
-corl_require(core_dir, :config)
-corl_require(util_dir, :interface) 
-corl_require(core_dir, :core) 
 
 #---
 
-# Include core utilities
-[ :liquid, 
-  :cli, 
-  :disk, 
-  :package, 
-  :shell, 
-  :ssh 
+# Include CORL utilities
+[ :ssh 
 ].each do |name| 
-  corl_require(util_dir, name)
+  nucleon_require(util_dir, name)
 end
 
-# Include core systems
-corl_require(core_dir, :corl)
-corl_require(core_dir, :gems)
-corl_require(core_dir, :manager)
-corl_require(plugin_dir, :base)
-corl_require(core_dir, :plugin)
-corl_require(core_dir, :facade)
+# Include facade
+nucleon_require(core_dir, :facade)
+
+# Include CORL core plugins
+nucleon_require(core_dir, :plugin)
 
 #-------------------------------------------------------------------------------
-# CORL initialization
+# CORL interface
+
+module CORL
+ 
+  def self.VERSION
+    File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))  
+  end
+  
+  #-----------------------------------------------------------------------------
+  
+  class Config
+    include Mixin::Lookup  
+  end
+  
+  #-----------------------------------------------------------------------------
+  # CORL initialization
+  
+  def self.lib_path
+    File.dirname(__FILE__)
+  end
+  
+  #---  
 
-CORL.initialize
+  reload(true) do |op, manager|
+    if op == :define
+      manager.define_namespace :CORL
+    
+      manager.define_type :configuration => :file,      # Core
+                          :network       => :default,   # Cluster
+                          :node          => :local,     # Cluster
+                          :machine       => :physical,  # Cluster
+                          :provisioner   => :puppetnode # Cluster
+    end
+  end
+end

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

@@ -18,11 +18,7 @@ This function checks a given test and returns the success value or a failure val
       success_value = (args.size > 1 ? args[1] : test)
       failure_value = (args.size > 2 ? args[2] : :undef)
       
-      #dbg(test, 'test')
-      #dbg(success_value, 'success')
-      
       value = CORL::Util::Data.ensure(test, success_value, failure_value)
-      #dbg(value, 'value')
     end
     return value
   end

data/locales/en.yml

@@ -4,154 +4,53 @@ en:
       batch_error: |-
         An issue was encountered during batch processing
     core:
-      util:
-        cli:
-          options:
-            help: |-
-              Display help information for this command
-            log_level: |-
-              Set the logging level for this execution run
-            encoded: |-
-              Optional encoded parameter set that contains default action settings (machine use only)
-          parse:
-            error: |-
-              There was a problem with the command arguments given
-        batch:
-          unexpected_error: |
-            There was a problem with batch %{process}: %{message}
-          corl_error: |
-            There was a problem with batch %{process}: %{message}
-      mixins:
-        project:
-          options:
-            provider: |-
-              CORL plugin provider to use for this project (default %{default_value})
-            reference: |-
-              Project URL or reference string to set as primary remote (default %{default_value})
-            revision: |-
-              Revision or branch to load (default %{default_value})
-        commit:
-          options:
-            commit: |-
-              Commit any uncommitted changes (default %{default_value})
-            empty: |-
-              Allow commits with no changes (default %{default_value})
-            message: |-
-              Commit message (defaults to auto generated commit information)
-            author: |-
-              Author of the changes being committed if different from the committer
-            propogate: |-
-              Propogate commits throughout the project tree (default %{default_value})
-        push:
-          options:
-            push: |-
-              Push changes to remote server (default %{default_value})
-            propogate: |-
-              Propogate pushes to the remote throughout the project tree (default %{default_value})
-            remote: |-
-              Remote name to push to (default %{default_value})
-            revision: |-
-              Branch to push (default %{default_value})
-        node:
-          options:
-            parallel: |-
-              Enable parallelism of node action execution (default %{default_value})
-            net_provider: |-
-              CORL network provider to use for managing cloud nodes (default %{default_value})
-            node_provider: |-
-              Default to using a specific node provider but individual node references can override (default %{default_value})
-            nodes: |-
-              Optional nodes on which to execute this action
-          errors:
-            network_provider: |-
-              Network plugin provider %{value} is not loaded >> Pick from the following: %{choices}
-            node_provider: |-
-              Node plugin provider %{value} is not loaded >> Pick from the following: %{choices}
-            nodes: |-
-              Node reference %{value} failed to parse or provider %{provider} isn't loaded (%{name})
-        keypair:
-          options:
-            private_key: |-
-              Optional existing private SSH key to use for SSH communication (new keys are generated by default)
-            require_password: |-
-              Require and prompt for a password for generated keys (default %{default_value})
-            key_type: |-
-              Type of SSH key to generate (default %{default_value})
-            key_bits: |-
-              Strength of generated key encryption in bits (default %{default_value})
-            key_comment: |-
-              Optional key comment (attached at the end of the public key)
-          errors:
-            private_key_not_found: |-
-              Private key %{value} not found
-            private_key_parse_error: |-
-              Private key %{value} failed to parse and can not be accepted as a valid private SSH key
-            key_type: |-
-              SSH key type %{value} not supported >> Pick from the following: %{choices}
-            key_bits: |-
-              Encryption strength must be greater than %{required} bits (%{value} specified)
-            no_password: |-
-              Password verification of private key was terminated (verification required to use encrypted SSH keys)             
-      exec:
-        help:
-          usage: |-
-            Usage
-          header: |-
-            Available actions
-          footer: |-
-            For help on any individual action run `corl <action> -h`
-        errors:
-          missing_argument: |-
-            Argument <%{name}> must be specified
-    actions:
-      extract:
+      action:
         options:
-          path: |-
-            Base path in which to extract the encoded data
-          encoded: |-
-            Encoded data to be extracted into the base path
+          parallel: |-
+            Enable parallelism of node action execution (default %{default_value})
+          net_provider: |-
+            CORL network provider to use for managing cloud nodes (default %{default_value})
+          node_provider: |-
+            Default to using a specific node provider but individual node references can override (default %{default_value})
+          nodes: |-
+            Optional nodes on which to execute this action
         errors:
-          path: |-
-            "Base path for extracted files must be an existing directory"
-          encoded: |-
-            "Data is either not properly encoded or is empty %{value}"
-      create:
-        options:
-          reference: |-
-            Git repository URL of CORL cloud to start project from (default %{default_value})
-          revision: |-
-            Revision or branch to initialize the project with (default %{default_value})
-          path: |-
-            Project path (default %{default_value})
-          start: |-
-            Creating a new CORL cloud at %{path} from %{reference}
-      add:
-        options:
-          sub_reference: |-
-            Repository URL of CORL component (module or library) to include in the project
-          sub_path: |-
-            Subproject path
-          editable: |-
-            Whether or not this sub project should be added as an editable remote (default %{default_value})
-        start: |-
-          Adding new subproject from %{sub_reference} at %{sub_path}
-      remove:
-        options:
-          sub_path: |-
-            Subproject path
-        start: |-
-          Removing existing subproject at %{sub_path}
-      update:
-        start: |-
-          Starting update run from provider %{project_provider} (ref: %{reference} rev: %{revision})
-        provision: |-
-          Running provisioning updates on %{node_name} from node provider %{node_provider}
-      save:
-        options:
-          files: |-
-            Optional space separated list of files to save
-        start: |-
-          Saving project changes with provider %{project_provider} (ref: %{reference} rev: %{revision})
+          network_provider: |-
+            Network plugin provider %{value} is not loaded >> Pick from the following: %{choices}
+          node_provider: |-
+            Node plugin provider %{value} is not loaded >> Pick from the following: %{choices}
+          nodes: |-
+            Node reference %{value} failed to parse or provider %{provider} isn't loaded (%{name})
+      node:
+        bootstrap:
+          status: |-
+            Bootstrap script %{script} failed with status %{status}
+      mixin:
+        action:
+          keypair:
+            options:
+              private_key: |-
+                Optional existing private SSH key to use for SSH communication (new keys are generated by default)
+              require_password: |-
+                Require and prompt for a password for generated keys (default %{default_value})
+              key_type: |-
+                Type of SSH key to generate (default %{default_value})
+              key_bits: |-
+                Strength of generated key encryption in bits (default %{default_value})
+              key_comment: |-
+                Optional key comment (attached at the end of the public key)
+            errors:
+              private_key_not_found: |-
+                Private key %{value} not found
+              private_key_parse_error: |-
+                Private key %{value} failed to parse and can not be accepted as a valid private SSH key
+              key_type: |-
+                SSH key type %{value} not supported >> Pick from the following: %{choices}
+              key_bits: |-
+                Encryption strength must be greater than %{required} bits (%{value} specified)
+              no_password: |-
+                Password verification of private key was terminated (verification required to use encrypted SSH keys)             
+    actions:
       images:
         options:
           match_case: |-
@@ -219,14 +118,22 @@ en:
           Starting bootstrap of machine %{hostname} (%{id})
         success: |-
           Machine %{hostname} (%{id}) successfully bootstrapped
+        failure: |-
+          Machine %{hostname} (%{id}) bootstrap failed with status %{status}
       exec:
         options:
           command: |-
             Command line executable and arguments to execute on machine
       seed:
         options:
-          home: |-
-            Home directory in which to initialize the deploy SSH keys (default %default_value})
+          project_branch: |-
+            Project branch to seed project (default %{default_value})
+          project_reference: |-
+            Reference to seed project (default %{default_value})
         errors:
           project_reference: |-
             Project reference %{value} failed to parse or provider %{provider} isn't loaded >> Possible providers: %{choices}
+      provision:
+        options:
+          provider: |-
+            Provisioner provider to use to provision the node (default %{default_value})