corl 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7aa748974143ba8a58a9d80fb344ccb4156060d
-  data.tar.gz: 8c3937130f2468a5462adc2fdb1171c730762387
+  metadata.gz: c360e505e5eaa8bdea103dad27a7868f06655153
+  data.tar.gz: 8cf2016ccc74e060bfa91372e7b54481b1a06a83
 SHA512:
-  metadata.gz: 333a02982ceb698acec7f3d5c2064b327b783cefe0315e2d1b4eb6390f88988134c9d9a49c496bea297eb5dd946f96bd86099d41eb80ded6fcdfaf07fc36606d
-  data.tar.gz: 9f086aca3037fa7c37eca60dc406d0167b0cacfd5b1577718ced41c36737500f58955eeb05cb9222f625ba996a3c64924fe69386a46330495b56fe6c043960c7
+  metadata.gz: f16e3bfa746c95710bd6e6b5aa0374e0de28ff8fe98374d76f237b74dbc9fdc341cc7880fbf5e4a5504122f739a7b337b19224340377e5f25d130acb01606ee3
+  data.tar.gz: f4e9f8fe0ca6e9478ae96018b346fcbb5ae509d10de97146cae1520b18787ec16ec673fa0f4ab46de9c795b0b3354abd4fff4a4ce36dc719b040e938382b6214

data/VERSION

@@ -1 +1 @@
-0.5.14
+0.5.15

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 #-------------------------------------------------------------------------------
 
-PUPPET_PACKAGE="3.7.3-1puppetlabs1"
+PUPPET_PACKAGE="3.7.4-1puppetlabs1"
 
 #---
 

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.14 ruby lib
+# stub: corl 0.5.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.14"
+  s.version = "0.5.15"
 
   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-02-09"
+  s.date = "2015-02-19"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -144,6 +144,7 @@ Gem::Specification.new do |s|
     "lib/nucleon/action/plugins.rb",
     "lib/nucleon/event/puppet.rb",
     "lib/nucleon/extension/corl_config.rb",
+    "lib/nucleon/extension/corl_executable.rb",
     "lib/nucleon/extension/vagrant.rb",
     "lib/nucleon/template/environment.rb",
     "lib/puppet/indirector/corl.rb",

data/lib/core/mixin/macro/network_settings.rb

@@ -3,55 +3,55 @@ module CORL
 module Mixin
 module Macro
 module NetworkSettings
-  
+
   def network_settings(_type)
-    
+
     # Networks are inherited unless explicitely set
-     
+
     define_method :network do
       plugin_parent
     end
- 
+
     define_method :network= do |network|
       myself.plugin_parent = network
     end
-  
+
     #---
-  
+
     define_method :setting do |property, default = nil, format = false|
       network.send("#{_type}_setting", plugin_provider, plugin_name, property, default, format)
     end
-  
+
     define_method :search do |property, default = nil, format = false, extra_groups = []|
       network.send("search_#{_type}", plugin_provider, plugin_name, property, default, format, extra_groups)
     end
-  
+
     define_method :set_setting do |property, value = nil|
       network.send("set_#{_type}_setting", plugin_provider, plugin_name, property, value)
     end
-  
+
     define_method :delete_setting do |property|
       network.send("delete_#{_type}_setting", plugin_provider, plugin_name, property)
     end
-  
+
     #---
- 
+
     define_method :[] do |name, default = nil, format = false|
       search(name, default, format)
     end
-  
+
     #---
-  
+
     define_method :[]= do |name, value|
       set_setting(name, value)
     end
-    
+
     #---
-  
+
     define_method :cache do
       network.cache
     end
-  
+
     define_method :cache_setting do |keys, default = nil, format = false|
       cache.get([ _type, plugin_provider, plugin_name, keys ].flatten, default, format)
     end
@@ -69,22 +69,22 @@ module NetworkSettings
     end
 
     #---
-  
+
     define_method :groups do
       array(myself[:settings])
     end
-    
+
     #---
-    
+
     define_method :add_groups do |groups|
       myself[:settings] = array(setting(:settings)) | array(groups)
     end
-    
+
     #---
-    
+
     define_method :remove_groups do |groups|
       myself[:settings] = array(setting(:settings)) - array(groups)
-    end    
+    end
   end
 end
 end

data/lib/core/plugin/agent.rb

@@ -7,6 +7,15 @@ module Nucleon
 module Plugin
 class Agent < Nucleon.plugin_class(:nucleon, :cloud_action)
 
+  #-----------------------------------------------------------------------------
+  # Info
+
+  def self.describe_base(group = nil, action = 'unknown', weight = -1000, description = nil, help = nil, provider_override = nil)
+    group = array(group).collect! {|item| item.to_sym }
+    group = [ :agent ] | group
+    super(group.uniq, action, weight, description, help, provider_override)
+  end
+
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
 
@@ -19,9 +28,13 @@ class Agent < Nucleon.plugin_class(:nucleon, :cloud_action)
 
   #---
 
-  def help
-    # TODO:  Localization
-    'AGENT ' + super
+  def arguments
+    # Don't use or the default log file naming will screw up due to having to
+    # move daemonization to the corl loader.
+    #
+    # See: lib/corl.rb
+    #
+    []
   end
 
   #-----------------------------------------------------------------------------
@@ -34,100 +47,49 @@ class Agent < Nucleon.plugin_class(:nucleon, :cloud_action)
   #---
 
   def agent_config
+    register_bool :log, true, 'corl.core.action.agent.options.log'
+    register_bool :truncate_log, true, 'corl.core.action.agent.options.truncate_log'
+
+    register_str :log_file, "/var/log/corl/#{plugin_provider}.log", 'corl.core.action.agent.options.log_file'
   end
 
   #-----------------------------------------------------------------------------
   # Operations
 
-  def execute(use_network = true, &code)
+  def execute(use_network = true, &block)
     super do |node|
       ensure_network do
-        daemonize(node)
-        yield node
-      end
-    end
-  end
-
-  #---
-
-  def daemonize(node)
-    # Mostly derived from rack gem implementation
-    #
-    # https://github.com/rack/rack/blob/master/lib/rack/server.rb
-    # http://www.jstorimer.com/blogs/workingwithcode/7766093-daemon-processes-in-ruby
-    #
-    if RUBY_VERSION < "1.9"
-      exit if fork
-      Process.setsid
-      safe_exit if fork
-
-      Dir.chdir network.directory
-
-      STDIN.reopen "/dev/null"
-      STDOUT.reopen "/dev/null", "a"
-      STDERR.reopen "/dev/null", "a"
-    else
-      Process.daemon
-    end
+        add_agent(node)
 
-    #---
+        trap(:INT) do
+          safe_exit
+        end
 
-    save_process(node)
-
-    at_exit do
-      shutdown_process(node)
-    end
-
-    trap(:INT) do
-      safe_exit
+        block.call(node)
+        remove_agent(node) if myself.status == code.success
+      end
     end
   end
-  protected :daemonize
 
   #-----------------------------------------------------------------------------
   # Utilities
 
-  def process_status(node)
-    agent_settings = node.agent(plugin_provider)
-
-    return :not_running unless agent_settings && agent_settings.has_key?(:pid)
-    return :dead if agent_settings[:pid] == 0
-
-    Process.kill(0, agent_settings[:pid])
-    :running
-
-    rescue Errno::ESRCH
-      :dead
-    rescue Errno::EPERM
-      :not_owned
-  end
-  protected :process_status
-
-  #---
-
-  def save_process(node)
+  def add_agent(node)
     settings[:pid] = Process.pid
 
-    node.add_agent(plugin_provider, settings)
-    node.save({
-      :message => "Agent #{plugin_provider} starting up on #{node.plugin_name}",
-      :remote => extension_set(:write_process_remote, :edit),
-      :push => true
-    })
+    stored_config = Util::Data.clean(settings.export)
+    stored_config = Util::Data.rm_keys(stored_config, [ :node_provider, :nodes, :color, :version ])
+
+    node.add_agent(plugin_provider, stored_config)
   end
-  protected :save_process
+  protected :add_agent
 
   #---
 
-  def shutdown_process(node)
+  def remove_agent(node)
     node.remove_agent(plugin_provider)
-    node.save({
-      :message => "Agent #{plugin_provider} shutting down on #{node.plugin_name}",
-      :remote => extension_set(:shutdown_handler_remote, :edit),
-      :push => true
-    })
   end
-  protected :shutdown_process
+  protected :remove_agent
 
   #---
 

data/lib/core/plugin/fog_node.rb

@@ -221,7 +221,14 @@ class FogBase < Nucleon.plugin_class(:CORL, :node)
   # Utilities
 
   def filter_output(type, data)
-    super
+    data = super
+
+    if type == :error
+      if data.include?('stdin: is not a tty') || data.include?('unable to re-open stdin')
+        data = ''
+      end
+    end
+    data
   end
 end
 end

data/lib/core/plugin/network.rb

@@ -336,7 +336,7 @@ class Network < Nucleon.plugin_class(:nucleon, :base)
     remote_name = config.delete(:remote, :edit)
 
     node_config = extended_config(:network_new_node, Config.new(Util::Data.clean({
-      :settings     => array(config.delete(:groups, [])) | [ "server" ],
+      :settings     => [ "server" ] | array(config.delete(:groups, [])),
       :region       => config.delete(:region, nil),
       :machine_type => config.delete(:machine_type, nil),
       :public_ip    => config.delete(:public_ip, nil),

data/lib/core/plugin/node.rb

@@ -21,7 +21,7 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
     ui.resource = Util::Console.colorize(hostname, @class_color)
     logger      = hostname
 
-    add_groups([ "all", plugin_provider.to_s, plugin_name.to_s ])
+    myself[:settings] = [ "all", plugin_provider.to_s, plugin_name.to_s ] | array(setting(:settings))
 
     unless reload
       @cli_interface = Util::Liquid.new do |method, args, &code|
@@ -386,10 +386,22 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
 
   def add_agent(provider, settings)
     set_setting([ :agents, provider ], Config.new(settings).export)
+
+    save({
+      :message => "Agent #{provider} starting up on #{plugin_provider} #{plugin_name}",
+      :remote  => extension_set(:add_agent_remote, :edit),
+      :push    => true
+    })
   end
 
   def remove_agent(provider)
     delete_setting([ :agents, provider ])
+
+    save({
+      :message => "Agent #{provider} shutting down on #{plugin_provider} #{plugin_name}",
+      :remote => extension_set(:remove_agent_remote, :edit),
+      :push => true
+    })
   end
 
   #-----------------------------------------------------------------------------
@@ -830,20 +842,21 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
 
           begin
             test = active_machine.exec(Util::Data.array(commands), config.export) do |type, command, data|
+              data = filter_output(type, data).rstrip
+
               unless quiet
                 unless local?
-                  text_output = filter_output(type, data).rstrip
-
-                  unless text_output.empty?
+                  unless data.empty?
                     if type == :error
-                      warn(text_output, { :i18n => false })
+                      warn(data, { :i18n => false })
                     else
-                      info(text_output, { :i18n => false })
+                      info(data, { :i18n => false })
                     end
                   end
                 end
                 yield(:progress, { :type => type, :command => command, :data => data }) if block_given?
               end
+              data
             end
             results = test if test
 
@@ -919,32 +932,37 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
     codes :network_load_error
 
     config = Config.ensure(options).defaults({
-      :log_level    => Nucleon.log_level,
       :net_remote   => :edit,
       :net_provider => network.plugin_provider
     })
 
     logger.info("Executing remote action #{provider} with encoded arguments: #{config.export.inspect}")
 
+    provider       = provider.to_s.gsub('_', ' ')
+    action_agent   = !!(provider =~ /^agent\s/)
     encoded_config = Util::CLI.encode(Util::Data.clean(config.export))
     action_config  = extended_config(:action, {
-      :command => provider.to_s.gsub('_', ' '),
-      :data    => { :encoded => encoded_config }
+      :command => provider,
+      :data    => { :encoded  => encoded_config }
     })
+    action_config[:data][:log_level] = Nucleon.log_level if Nucleon.log_level
 
     quiet    = config.get(:quiet, false)
     parallel = config.get(:parallel, true)
 
     command_base  = 'corl'
     command_base  = "NUCLEON_NO_PARALLEL=1 #{command_base}" unless parallel
+    command_base  = "NUCLEON_NO_COLOR=1 #{command_base}" if action_agent
 
     result = command(command_base, { :subcommand => action_config, :as_admin => true, :quiet => quiet }) do |op, data|
       yield(op, data) if block_given?
     end
 
     # Update local network configuration so we capture any updates
-    if result.status == code.success && ! network.load({ :remote => config[:net_remote], :pull => true })
-      result.status = code.network_load_error
+    unless action_agent
+      if result.status == code.success && ! network.load({ :remote => config[:net_remote], :pull => true })
+        result.status = code.network_load_error
+      end
     end
     result
   end

data/lib/core/vagrant/commands/launcher.rb

@@ -4,8 +4,6 @@ module CORL
 module Command
 class Launcher < ::Vagrant.plugin("2", :command)
 
-  include ::CORL::Parallel # Mainly for auto locking of resources
-
   #-----------------------------------------------------------------------------
 
   def self.synopsis

data/lib/core/vagrant/config.rb

@@ -375,8 +375,11 @@ module Config
 
     if use_nfs && bindfs_installed
       machine.vm.synced_folder ".", "/vagrant", disabled: true
-      machine.vm.synced_folder ".", "/tmp/vagrant", :type => "nfs"
-      machine.bindfs.bind_folder "/tmp/vagrant", "/vagrant"
+
+      unless ENV['CORL_NO_NETWORK_SHARE']
+        machine.vm.synced_folder ".", "/tmp/vagrant", :type => "nfs"
+        machine.bindfs.bind_folder "/tmp/vagrant", "/vagrant"
+      end
     end
 
     render("\n") unless already_processed

data/lib/core/vagrant/plugins.rb

@@ -1,6 +1,6 @@
 
-if Vagrant::VERSION < "1.2.0"
-  raise "The Vagrant CORL plugin is only compatible with Vagrant 1.2+"
+if Vagrant::VERSION < "1.5.0"
+  raise "The Vagrant CORL plugin is only compatible with Vagrant 1.5+"
 end
 
 module VagrantPlugins

data/lib/corl.rb

@@ -24,6 +24,81 @@ util_dir          = File.join(core_dir, 'util')
 mod_dir           = File.join(core_dir, 'mod')
 vagrant_dir       = File.join(core_dir, 'vagrant')
 
+vagrant_exists    = defined?(Vagrant) == 'constant' && Vagrant.class == Module
+
+#-------------------------------------------------------------------------------
+# Daemonize if needed
+#
+# This must come before Nucleon is loaded due to a huge bug in Celluloid that
+# prevents it from working in parallel mode if Celluloid actors are already
+# initialized before daemonization.
+
+# Must be an agent that is running locally
+
+# For the record, this stinks, it's ugly, and I hate it, but the maintainer
+# of Celluloid does not seem to regard it as important enough to fix.
+#
+# https://github.com/celluloid/celluloid/issues/97
+#
+# For agent options processed here, see lib/core/plugin/agent.rb
+#
+action_start_index = vagrant_exists ? 1 : 0
+
+if ARGV[action_start_index].to_sym == :agent
+  remote_exec            = false
+
+  log                    = true
+  truncate_log           = true
+
+  log_file               = nil
+  agent_provider         = []
+  process_log_file_value = false
+
+  first_option_found     = false
+
+  # Argument processing
+  ARGV[(action_start_index + 1)..-1].each do |arg|
+    first_option_found = true if arg[0] == '-'
+
+    if arg =~ /^\-\-nodes\=?/
+      remote_exec = true
+    elsif arg == "--no-log"
+      log = false
+    elsif arg == "--no-truncate_log"
+      truncate_log = false
+    elsif arg =~ /^\-\-log_file(?=\=(.*))?/
+      if $1
+        log_file = $1
+      else
+        process_log_file_value = true
+      end
+    elsif process_log_file_value
+      log_file               = arg
+      process_log_file_value = false
+    elsif ! first_option_found
+      agent_provider << arg
+    end
+  end
+
+  # TODO: Need better way to share with base agent default log file. (mixin?)
+  log_file = "/var/log/corl/agent_#{agent_provider.join('_')}.log" unless log_file
+
+  unless remote_exec || vagrant_exists
+    # Daemonize process
+    Process.daemon
+
+    # Log all output, or not
+    if log
+      FileUtils.mkdir_p('/var/log/corl')
+      File.write(log_file, '') if truncate_log
+
+      $stderr.reopen(log_file, 'a')
+      $stdout.reopen($stderr)
+      $stdout.sync = $stderr.sync = true
+    end
+  end
+end
+
 #-------------------------------------------------------------------------------
 # CORL requirements
 
@@ -103,9 +178,8 @@ nucleon_require(core_dir, :build)
 nucleon_require(core_dir, :plugin)
 
 # Include Vagrant plugins (only include if running inside Vagrant)
-if defined?(Vagrant) == 'constant' && Vagrant.class == Module
-  nucleon_require(vagrant_dir, :plugins)
-end
+nucleon_require(vagrant_dir, :plugins) if vagrant_exists
+
 
 #-------------------------------------------------------------------------------
 # CORL interface

data/lib/nucleon/action/network/config.rb

@@ -35,10 +35,6 @@ class Config < Nucleon.plugin_class(:nucleon, :cloud_action)
 
   #---
 
-  def ignore
-    node_ignore
-  end
-
   def arguments
     [ :name, :value ]
   end

data/lib/nucleon/extension/corl_executable.rb

@@ -0,0 +1,12 @@
+
+module Nucleon
+module Extension
+class CorlExecutable < Nucleon.plugin_class(:nucleon, :extension)
+
+  def executable_load(config)
+    network_path = Nucleon.fact(:corl_network)
+    Nucleon.load_plugins(network_path) if Dir.pwd != network_path
+  end
+end
+end
+end

data/locales/en.yml

@@ -23,6 +23,14 @@ en:
             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})
+        agent:
+          options:
+            log: |-
+              Whether or not to render agent stdout and stderr to a log file (default %{default_value})
+            truncate_log: |-
+              Truncate log file before writing any more output (default %{default_value})
+            log_file: |-
+              Log file to route agent output (default %{default_value})
       node:
         bootstrap:
           status: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
@@ -304,6 +304,7 @@ files:
 - lib/nucleon/action/plugins.rb
 - lib/nucleon/event/puppet.rb
 - lib/nucleon/extension/corl_config.rb
+- lib/nucleon/extension/corl_executable.rb
 - lib/nucleon/extension/vagrant.rb
 - lib/nucleon/template/environment.rb
 - lib/puppet/indirector/corl.rb