corl 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa06730953a8ed3414ef34103d332b911eccf829
-  data.tar.gz: f02ae226797584ca6bde2dd4b84c8e193148d373
+  metadata.gz: 5c9b999aa83da59dc7085e95caa8c0caea559168
+  data.tar.gz: b7f983b479ec01f6d44293b7747f43bce35e0e96
 SHA512:
-  metadata.gz: 1d6425fa3f20d527ed3e7850782ae557eadb1f1756a7e7bea5bfc7235335875f77d98a133ae4fd1e095177c2628173a47d8e7b2b1ecd5269011a1fa26631e0fc
-  data.tar.gz: 0e3ad718e7e4cf9700be6251b7d1dd3a65c26ec6778d0562ddaefe9337af52349618d9a94a83ec348cf9aa097b1820f8a9738acb2cba856cf4d7f1322a21ae5c
+  metadata.gz: 8ec5afdc6c44f8f23b7ccc97b576d098bc861f7dd7aaa0109451f4f4e28a4132b0b30586e94cf4134c39d216ab8ddd918393b0c9c54875918085fa959344a7d1
+  data.tar.gz: 1b04ac6e177445e9005cac13856f6eb83884099f3de09f9dba9b81ddfd6907a66a1c7dceb45939bb1c21aa7001c0a310a4195c1a68d84d353bb9779a782934f5

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.12

data/corl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.5.11 ruby lib
+# stub: corl 0.5.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.11"
+  s.version = "0.5.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2015-01-18"
+  s.date = "2015-01-19"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -106,15 +106,15 @@ 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/images.rb",
-    "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/network/config.rb",
+    "lib/nucleon/action/network/create.rb",
+    "lib/nucleon/action/network/images.rb",
+    "lib/nucleon/action/network/inspect.rb",
+    "lib/nucleon/action/network/machines.rb",
+    "lib/nucleon/action/network/regions.rb",
+    "lib/nucleon/action/network/remote.rb",
+    "lib/nucleon/action/network/settings.rb",
+    "lib/nucleon/action/network/vagrantfile.rb",
     "lib/nucleon/action/node/IP.rb",
     "lib/nucleon/action/node/SSH.rb",
     "lib/nucleon/action/node/authorize.rb",

data/lib/CORL/builder/identity.rb

@@ -43,12 +43,13 @@ class Identity < Nucleon.plugin_class(:CORL, :builder)
 
     unless identities.has_key?(provider_id)
       project = build_config.manage(:project, extended_config(:identity, {
-        :directory     => full_directory,
-        :url           => project_reference,
-        :create        => File.directory?(full_directory) ? false : true,
-        :pull          => true,
-        :internal_ip   => CORL.public_ip, # Needed for seeding Vagrant VMs
-        :manage_ignore => false
+        :directory      => full_directory,
+        :url            => project_reference,
+        :create         => File.directory?(full_directory) ? false : true,
+        :pull           => true,
+        :internal_ip    => CORL.public_ip, # Needed for seeding Vagrant VMs
+        :manage_ignore  => false,
+        :nucleon_resave => true
       }))
       unless project
         warn("Identity #{cyan(name)} failed to initialize", { :i18n => false })

data/lib/CORL/builder/project.rb

@@ -20,7 +20,7 @@ class Project < Nucleon.plugin_class(:CORL, :builder)
       :pull          => true,
       :internal_ip   => CORL.public_ip, # Needed for seeding Vagrant VMs
       :manage_ignore => false,
-      :corl_file     => false
+      :nucleon_file  => false
     }))
     unless project
       warn("Project #{cyan(path)} failed to initialize", { :i18n => false })

data/lib/core/mixin/machine/ssh.rb

@@ -44,7 +44,23 @@ module SSH
       end
 
     rescue => error
-      warn(error, { :i18n => false })
+      if error.is_a?(Net::SSH::AuthenticationFailed) && ssh_config[:keypair]
+        key_file_base = File.join(ssh_config[:key_dir], "#{ssh_config[:key_name]}_#{ssh_config[:keypair].type}")
+
+        Util::Disk.delete(key_file_base)
+        Util::Disk.delete("#{key_file_base}.pub")
+
+        node.keypair            = nil
+        ssh_config[:keypair]    = nil
+        ssh_config[:reset_conn] = true
+        retry
+      else
+        message = error.message
+        if message.include?("Neither PUB key nor PRIV key")
+          message = "Authentication failed for #{user}@#{public_ip} on port #{ssh_port} (most likely wrong password entered)"
+        end
+        warn(message, { :i18n => false })
+      end
       success = false
     end
     success

data/lib/core/plugin/cloud_action.rb

@@ -158,7 +158,7 @@ class CloudAction < Nucleon.plugin_class(:nucleon, :action)
       network_path = ( path.nil? ? Dir.pwd : File.expand_path(path) )
     end
 
-    if File.exists?(File.join(network_path, '.corl'))
+    if File.exists?(File.join(network_path, '.nucleon'))
       # Load network if it exists
       network_config = extended_config(:network, { :directory => network_path, :new => true })
       @network       = CORL.network(network_path, network_config, provider)

data/lib/core/plugin/node.rb

@@ -481,11 +481,12 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
 
   def lookup(property, default = nil, options = {})
     unless local?
-      config = Config.ensure(options).import({ :property => property, :quiet => true })
+      config = Config.ensure(options).import({ :properties => [ property ], :quiet => true })
       result = run.node_lookup(config)
 
       if result.status == code.success
-        return Util::Data.value(Util::Data.parse_json(result.errors), default)
+        result_data = Util::Data.parse_json(result.errors)
+        return Util::Data.value(result_data[property.to_s], default)
       end
       return default
     end

data/lib/nucleon/action/{cloud → network}/config.rb

@@ -1,66 +1,66 @@
 
 module Nucleon
 module Action
-module Cloud
+module Network
 class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
-  
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
-    super(:cloud, :config, 949)
+    super(:network, :config, 949)
   end
- 
+
   #-----------------------------------------------------------------------------
   # Settings
- 
+
   def configure
     super do
       codes :configuration_parse_failed,
             :configuration_save_failed,
             :configuration_delete_failed
-      
+
       register_str :name
       register_array :value
-      
-      register_bool :array      
+
+      register_bool :array
       register_bool :delete
       register_bool :append
-      
+
       register_translator :input_format
       register_translator :save_format
       register_translator :format, :json
     end
   end
-  
+
   #---
-  
+
   def ignore
     node_ignore
   end
-  
+
   def arguments
     [ :name, :value ]
   end
-  
+
   #-----------------------------------------------------------------------------
   # Operations
-   
+
   def execute
     super do |node|
       ensure_network do
         config_info = parse_config_reference(node, settings[:name])
-        
+
         unless config_info
           myself.status = code.configuration_parse_failed
         end
-        
+
         if settings.delete(:delete, false)
           delete_config_property(config_info)
-          
+
         elsif config_info[:property].nil?
           render_config_properties(config_info)
-           
+
         elsif ! settings[:value].empty?
           set_config_property(config_info, settings[:value])
         else
@@ -69,10 +69,10 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
       end
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Sub operations
-  
+
   def render_config_properties(config_info)
     if file_labels = config_info[:rendered_files]
       info('subconfigurations', { :prefix => false })
@@ -80,93 +80,93 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
       file_labels.each do |label|
         prefixed_message(:info, '  ', label, { :i18n => false, :prefix => false })
       end
-      info("\n", { :i18n => false })  
+      info("\n", { :i18n => false })
     else
       format        = settings[:format]
       myself.result = config_info[:config].export
       render result, :format => format
-    end  
+    end
   end
-  
+
   #---
-  
+
   def render_config_property(config_info)
     format        = settings[:format]
     myself.result = config_info[:value]
-    render result, :format => format 
+    render result, :format => format
   end
-  
+
   #---
-  
+
   def delete_config_property(config_info)
     remote_text    = remote_message(settings[:net_remote])
-    config_file    = config_info[:file].sub(network.directory + File::SEPARATOR, '')    
+    config_file    = config_info[:file].sub(network.directory + File::SEPARATOR, '')
     render_options = { :config_file => blue(config_file), :remote_text => yellow(remote_text) }
     success        = false
-    
+
     if config_info[:property]
-      name = parse_property_name(config_info[:property])    
+      name = parse_property_name(config_info[:property])
       render_options.merge({ :name => blue(name) })
-    
+
       config_info[:config].delete(config_info[:property])
-    
-      if File.exists?(config_info[:file])    
+
+      if File.exists?(config_info[:file])
         if Util::Disk.write(config_info[:file], config_info[:translator].generate(config_info[:config].export))
           success = true
         else
           error('file_save', render_options)
-          myself.status = code.configuration_save_failed  
+          myself.status = code.configuration_save_failed
         end
       else
-        info('no_config_file', render_options)    
+        info('no_config_file', render_options)
       end
     else
       if File.exists?(config_info[:file])
         if FileUtils.rm(config_info[:file])
           success = true
         else
-          error('file_remove', render_options)  
+          error('file_remove', render_options)
         end
-      end    
+      end
     end
-    
+
     if success
       if network.save({ :files => config_file, :remote => settings[:net_remote], :message => "Deleting configuration #{name} from #{config_file}", :allow_empty => true })
         success('delete', render_options)
       else
         error('delete', render_options)
-        myself.status = code.configuration_save_failed    
+        myself.status = code.configuration_save_failed
       end
     end
   end
-  
+
   #---
-  
+
   def set_config_property(config_info, values)
-    name        = parse_property_name(config_info[:property])    
+    name        = parse_property_name(config_info[:property])
     remote_text = remote_message(settings[:net_remote])
     config_file = config_info[:file].sub(network.directory + File::SEPARATOR, '')
-    
+
     render_options = { :config_file => blue(config_file), :name => blue(name), :remote_text => yellow(remote_text) }
-    
+
     config_file  = config_info[:file].sub(network.directory + File::SEPARATOR, '')
     input_format = settings[:input_format]
-    
+
     values.each_with_index do |value, index|
       if input_format
-        translator    = CORL.translator({}, input_format) 
+        translator    = CORL.translator({}, input_format)
         values[index] = translator.parse(value)
       end
       values[index] = Util::Data.value(values[index])
     end
-    
+
     if settings[:append]
       if prev_value = config_info[:value]
         prev_value = array(prev_value)
-        
+
         values.each do |value|
           prev_value.push(value)
-        end        
+        end
         values = prev_value
       end
     else
@@ -174,60 +174,60 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
         values = array(values)
       elsif values.size == 1
         values = values[0]
-      end    
+      end
     end
-            
-    myself.result = values    
+
+    myself.result = values
     config_info[:config].set(config_info[:property], result)
-    
+
     FileUtils.mkdir_p(File.dirname(config_info[:file]))
-    
+
     if Util::Disk.write(config_info[:file], config_info[:translator].generate(config_info[:config].export))
       if network.save({ :files => config_file, :remote => settings[:net_remote], :message => "Updating configuration #{name} in #{config_file}", :allow_empty => true })
         success('update', render_options)
       else
         error('update', render_options)
-        myself.status = code.configuration_save_failed    
+        myself.status = code.configuration_save_failed
       end
     else
       error('file_save', render_options)
-      myself.status = code.configuration_save_failed  
+      myself.status = code.configuration_save_failed
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def parse_config_reference(node, name)
     # @TODO: Break this method up, URGENTLY, before it gets too hideous
     # Oh wait, it's already too hideous
-    
+
     info        = {}
     data        = {}
-    config      = CORL::Config.new({}, {}, true, false)    
+    config      = CORL::Config.new({}, {}, true, false)
     translators = CORL.loaded_plugins(:nucleon, :translator).keys
-    
+
     # common@php::apache::memory_limit
     # identity/test@users::user[admin][shell]
     # servers/development/dev.loc@facts[server_environment]
-    
+
     config_elements  = name.split('@')
-    
+
     property         = config_elements.size > 1 ? config_elements.pop : nil
-    config_elements  = config_elements[0].split('/') if config_elements.size > 0   
-    config_file_name = config_elements.pop    
+    config_elements  = config_elements[0].split('/') if config_elements.size > 0
+    config_file_name = config_elements.pop
     config_path      = File.join(network.config_directory, *config_elements)
     config_dir       = config_file_name ? File.join(config_path, config_file_name) : config_path
     config_file      = nil
     config_files     = nil
     translator       = []
-          
+
     if config_file_name
       property = property.gsub(/\]$/, '').split(/\]?\[/) if property
-        
+
       translators.each do |translator_name|
         config_file = File.join(config_path, "#{config_file_name}." + translator_name.to_s)
-        
+
         if File.exists?(config_file)
           unless data = Util::Disk.read(config_file)
             error('file_read', { :config_file => config_file })
@@ -236,17 +236,17 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
           unless load_translator = CORL.translator({}, translator_name)
             error('translator_load', { :translator => translator_name })
             return nil
-          end    
+          end
           config.import(load_translator.parse(data))
           translator << load_translator
         end
       end
     end
-    
+
     file_exists = translator.empty? ? false : true
-    
+
     if settings[:save_format]
-      translator = CORL.translator({}, settings[:save_format])    
+      translator = CORL.translator({}, settings[:save_format])
     else
       if translator.empty?
         translator = CORL.translator({}, CORL.type_default(:nucleon, :translator))
@@ -254,42 +254,42 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
         translator = translator.size > 1 ? translator.shift : translator[0]
       end
     end
-    
+
     config_file = File.join(config_path, "#{config_file_name}." + translator.plugin_name.to_s)
-      
+
     unless file_exists
       hiera_search_path = node.hiera_configuration[:hierarchy]
       config_files      = []
-      
+
       if File.directory?(config_dir)
         config_files = Dir.glob("#{config_dir}/**/*").select do |file|
           is_config = false
-          
+
           translators.each do |translator_name|
             is_config = true if file.match(/\.#{translator_name}/)
           end
           is_config
         end
-      
+
         config_files.collect! do |file|
           file.sub(/#{network.config_directory + File::SEPARATOR}/, '')
         end
       end
-      
+
       ordered_config_files  = []
       rendered_config_files = []
-      
+
       hiera_search_path.each do |search_path|
         search_components = search_path.split(File::SEPARATOR)
-        
+
         rendered_config_files << "SEARCH: #{search_path}"
-         
+
         config_files.each do |file|
           file_ext                 = File.extname(file)
           file_components          = file.sub(/\..*$/, '').split(File::SEPARATOR)
           rendered_file_components = []
           file_match               = true
-          
+
           search_components.each_with_index do |search_item, index|
             if search_item.strip =~ /^%{:?:?([^}]+)}$/ && index < file_components.size
               rendered_file_components << cyan(file_components[index])
@@ -299,9 +299,9 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
               rendered_file_components << yellow(search_item)
             end
           end
-          
+
           rendered_file = "        #{rendered_file_components.join(File::SEPARATOR)} [ #{blue(file_ext.sub('.', ''))} ]"
-          
+
           if file_match && ! ordered_config_files.include?(file)
             ordered_config_files << file
             rendered_config_files << rendered_file
@@ -309,7 +309,7 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
         end
       end
     end
-      
+
     {
       :translator     => translator,
       :file           => config_file,

data/lib/nucleon/action/{cloud → network}/create.rb

@@ -1,48 +1,48 @@
 
 module Nucleon
 module Action
-module Cloud
+module Network
 class Create < Nucleon.plugin_class(:nucleon, :cloud_action)
 
   include Mixin::Action::Project
- 
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
-    super(:cloud, :create, 1000)
+    super(:network, :create, 1000)
   end
-  
+
   #-----------------------------------------------------------------------------
   # Settings
-  
+
   def configure
-    super do    
-      config.defaults(CORL.action_config(:project_create))      
+    super do
+      config.defaults(CORL.action_config(:project_create))
       config[:project_reference].default = 'github:::coralnexus/network-template'
     end
   end
-  
+
   #---
-  
+
   def ignore
     node_ignore
   end
-  
+
   def arguments
     [ :project_reference ]
   end
- 
+
   #-----------------------------------------------------------------------------
   # Operations
-   
+
   def execute
     super(false) do
       info('start')
-      
+
       project       = project_load(settings[:path], true, true)
       myself.status = code.project_failure unless project
-      
+
       if project.remote(:origin) =~ /coralnexus\/network\-template/
         project.delete_remote(:origin)
         project.delete_remote(:edit)

data/lib/nucleon/action/{cloud → network}/images.rb

@@ -1,49 +1,49 @@
 
 module Nucleon
 module Action
-module Cloud
+module Network
 class Images < Nucleon.plugin_class(:nucleon, :cloud_action)
-  
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
-    super(:cloud, :images, 850)
+    super(:network, :images, 850)
   end
 
   #-----------------------------------------------------------------------------
   # Settings
-  
+
   def configure
     super do
       codes :node_load_failure,
             :image_load_failure
-      
-      register :region, :str, nil      
+
+      register :region, :str, nil
       register :match_case, :bool, false
       register :require_all, :bool, true
       register :search, :array, []
     end
   end
-  
+
   def node_config
     super
     config[:node_provider].default = nil
   end
-  
+
   #---
-  
+
   def ignore
     node_ignore - [ :node_provider ]
   end
-  
+
   def arguments
     [ :node_provider, :search ]
   end
-  
+
   #-----------------------------------------------------------------------------
   # Operations
- 
+
   def execute
     super do |local_node|
       ensure_network do
@@ -52,7 +52,7 @@ class Images < Nucleon.plugin_class(:nucleon, :cloud_action)
             images.each do |image|
               prefixed_message(:info, '  ', node.render_image(image), { :i18n => false, :prefix => false })
             end
-          
+
             myself.result = images
             success('results', { :images => images.length }) if images.length > 1
           else