corl 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -68,7 +68,7 @@ GEM
     netrc (0.7.7)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    nucleon (0.1.4)
+    nucleon (0.1.6)
       celluloid (~> 0.15)
       childprocess (~> 0.5.0)
       deep_merge (~> 1.0)

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-05"
+  s.date = "2014-03-16"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     "corl.gemspec",
     "lib/CORL/action/authorize.rb",
     "lib/CORL/action/bootstrap.rb",
+    "lib/CORL/action/build.rb",
     "lib/CORL/action/destroy.rb",
     "lib/CORL/action/exec.rb",
     "lib/CORL/action/image.rb",
@@ -60,7 +61,6 @@ Gem::Specification.new do |s|
     "lib/CORL/action/stop.rb",
     "lib/CORL/configuration/file.rb",
     "lib/CORL/event/puppet.rb",
-    "lib/CORL/extension/puppetloader.rb",
     "lib/CORL/machine/aws.rb",
     "lib/CORL/machine/physical.rb",
     "lib/CORL/machine/rackspace.rb",
@@ -69,13 +69,12 @@ Gem::Specification.new do |s|
     "lib/CORL/node/local.rb",
     "lib/CORL/node/rackspace.rb",
     "lib/CORL/provisioner/puppetnode.rb",
-    "lib/CORL/provisioner/puppetnode/resource.rb",
-    "lib/CORL/provisioner/puppetnode/resource_group.rb",
     "lib/CORL/template/environment.rb",
     "lib/core/errors.rb",
     "lib/core/facade.rb",
     "lib/core/mixin/action/keypair.rb",
     "lib/core/mixin/lookup.rb",
+    "lib/core/mixin/macro/network_settings.rb",
     "lib/core/mod/fog_aws_server.rb",
     "lib/core/mod/hiera_backend.rb",
     "lib/core/plugin/action.rb",
@@ -86,17 +85,23 @@ Gem::Specification.new do |s|
     "lib/core/plugin/network.rb",
     "lib/core/plugin/node.rb",
     "lib/core/plugin/provisioner.rb",
+    "lib/core/util/puppet.rb",
+    "lib/core/util/puppet/resource.rb",
+    "lib/core/util/puppet/resource_group.rb",
     "lib/corl.rb",
+    "lib/facter/corl_build.rb",
     "lib/facter/corl_config_ready.rb",
     "lib/facter/corl_exists.rb",
     "lib/facter/corl_network.rb",
+    "lib/facter/custom_facts.rb",
+    "lib/facter/vagrant_exists.rb",
     "lib/hiera/corl_logger.rb",
     "lib/puppet/indirector/corl.rb",
     "lib/puppet/indirector/data_binding/corl.rb",
-    "lib/puppet/parser/functions/config_initialized.rb",
     "lib/puppet/parser/functions/corl_include.rb",
+    "lib/puppet/parser/functions/corl_initialize.rb",
+    "lib/puppet/parser/functions/corl_merge.rb",
     "lib/puppet/parser/functions/corl_resources.rb",
-    "lib/puppet/parser/functions/deep_merge.rb",
     "lib/puppet/parser/functions/ensure.rb",
     "lib/puppet/parser/functions/file_exists.rb",
     "lib/puppet/parser/functions/global_array.rb",

data/lib/CORL/action/build.rb

@@ -0,0 +1,30 @@
+
+module CORL
+module Action
+class Build < Plugin::CloudAction
+ 
+  #-----------------------------------------------------------------------------
+  # Settings
+  
+  def configure
+    super do
+      codes :network_failure
+    end
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Operations
+   
+  def execute
+    super do |node, network|
+      if network && node
+        info('corl.actions.build.start')  
+        node.build
+      else
+        myself.status = code.network_failure
+      end
+    end
+  end
+end
+end
+end

data/lib/CORL/action/provision.rb

@@ -8,22 +8,48 @@ class Provision < Plugin::CloudAction
   
   def configure
     super do
-      register :provider, :str, :puppetnode
-      register :directory, :str, :default
+      codes :network_failure,
+            :provision_failure
     end
   end
   
-  def arguments
-    [ :directory ]
-  end
-
   #-----------------------------------------------------------------------------
   # Operations
   
   def execute
     super do |node, network|
-      info('corl.actions.provision.start')
-      
+      if network && node
+        info('corl.actions.provision.start')
+        
+        success = true
+        
+        if CORL.admin?
+          unless node.build_time && File.directory?(network.build_directory)
+            success = node.build
+          end
+        
+          if success
+            provisioner_info = node.provisioner_info   
+        
+            node.provisioners.each do |provider, collection|
+              provider_info = provisioner_info[provider]
+              profiles      = provider_info[:profiles]
+          
+              collection.each do |name, provisioner|
+                build_profiles = provisioner.build_profiles
+            
+                if supported_profiles = provisioner.supported_profiles(profiles)
+                  profile_success = provisioner.provision(supported_profiles)
+                  success         = false unless profile_success
+                end
+              end
+            end
+            myself.status = code.provision_failure unless success
+          end
+        end
+      else
+        myself.status = code.network_failure  
+      end
     end
   end
 end

data/lib/CORL/configuration/file.rb

@@ -7,19 +7,10 @@ class File < CORL.plugin_class(:configuration)
   # Configuration plugin interface
   
   def normalize(reload)
-    super
-    
-    logger.info("Setting source configuration project")
-    @project = CORL.project(extended_config(:project, {
-      :directory => _delete(:directory, Dir.pwd),
-      :url       => _delete(:url),
-      :revision  => _delete(:revision)
-    }), _delete(:project_provider))
-        
-    _set(:search, Config.new)
-    _set(:router, Config.new)
-    
-    set_location(@project)
+    super do        
+      _set(:search, Config.new)
+      _set(:router, Config.new)
+    end
   end
   
   #--- 
@@ -30,22 +21,9 @@ class File < CORL.plugin_class(:configuration)
       Util::Disk.close(file_name)
     end
   end
-     
-  #-----------------------------------------------------------------------------
-  # Checks
-  
-  def can_persist?
-    project.can_persist?
-  end
-      
+    
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-
-  def project
-    @project
-  end
-  
-  #---
   
   def search
     _get(:search)
@@ -60,29 +38,10 @@ class File < CORL.plugin_class(:configuration)
   #-----------------------------------------------------------------------------
   
   def set_location(directory)
-    if directory && directory.is_a?(CORL::Plugin::Project)
-      logger.debug("Setting source project directory from other project at #{directory.directory}")
-      project.set_location(directory.directory)
-      
-    elsif directory && directory.is_a?(String) || directory.is_a?(Symbol)
-      logger.debug("Setting source project directory to #{directory}")
-      project.set_location(directory.to_s)
-    end
+    super
     search_files if directory
   end
   
-  #---
-  
-  def remote(name)
-    project.remote(name)
-  end
-  
-  #---
-  
-  def set_remote(name, location)
-    project.set_remote(name, location)
-  end
-  
   #-----------------------------------------------------------------------------
   # Configuration loading / saving
     
@@ -132,10 +91,13 @@ class File < CORL.plugin_class(:configuration)
   # file_data[config_name][key...] = config
   
   def separate    
-    file_data = Config.new
+    file_data        = Config.new
+    default_provider = CORL.type_default(:translator)
     
     split_config = lambda do |properties, local_router, parents = []|
       properties.each do |name, value|
+        next if name.to_sym == :nodes
+        
         keys = [ parents, name ].flatten
         
         if value.is_a?(Hash) && ! value.empty?
@@ -171,8 +133,7 @@ class File < CORL.plugin_class(:configuration)
               file_data.set([ config_name, keys ].flatten, value)
             else
               # Resort to sane defaults
-              default_provider = CORL.type_default(:translator)
-              config_name      = "corl.#{default_provider}"
+              config_name = "corl.#{default_provider}"
               file_data.set([ config_name, keys ].flatten, value)
             end      
           end
@@ -180,8 +141,16 @@ class File < CORL.plugin_class(:configuration)
       end
     end
     
+    if config.get(:nodes, false)
+      config[:nodes].each do |provider, data|
+        data.each do |name, info|
+          file_data.set([ ::File.join('nodes', provider.to_s, "#{name}.#{default_provider}"), :nodes, provider, name ], info)  
+        end
+      end
+    end    
+    
     # Whew!  Glad that's over...
-    split_config.call(config.export, router.export)
+    split_config.call(Util::Data.subset(config.export, config.keys - [ :nodes ]), router.export)
     file_data     
   end
   protected :separate
@@ -313,27 +282,44 @@ class File < CORL.plugin_class(:configuration)
   # Utilities
    
   def search_files
+    
+    add_search_file = lambda do |config_name, file, provider, info|
+      if Util::Disk.exists?(file)            
+        search[config_name] = {
+          :provider => provider,
+          :info     => info,
+          :file     => file
+        }
+        ObjectSpace.define_finalizer(myself, myself.class.finalize(file))
+      else
+        logger.info("Configuration file #{file} does not exist")   
+      end  
+    end
+    
     if Util::Data.empty?(project.directory)
       logger.debug("Clearing configuration file information")      
       search.clear
     else
-      file_bases = [ "corl", extension_collect(:base) ].flatten
+      translators = CORL.loaded_plugins(:translator)
+      file_bases  = [ "corl", extension_collect(:base) ].flatten
+      
+      project.localize do
+        translators.each do |provider, info|
+          Dir.glob(::File.join('nodes', '**', "*.#{provider}")).each do |file|
+            config_name = file
+            file        = ::File.join(project.directory, file)
+            
+            add_search_file.call(config_name, file, provider, info)  
+          end
+        end
+      end
       
-      Manager.connection.loaded_plugins(:translator).each do |provider, info|
+      translators.each do |provider, info|
         file_bases.each do |file_base|
           config_name = "#{file_base}.#{provider}"
           file        = Util::Disk.filename([ project.directory, config_name ])
-          
-          if Util::Disk.exists?(file)            
-            search[config_name] = {
-              :provider => provider,
-              :info     => info,
-              :file     => file
-            }
-            ObjectSpace.define_finalizer(myself, myself.class.finalize(file))
-          else
-            logger.info("Configuration file #{file} does not exist")   
-          end
+         
+          add_search_file.call(config_name, file, provider, info)
         end
       end     
       logger.debug("Setting configuration file information to #{search.inspect}")