corl 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0987aea3e56e4c6c391769f7a397327470928975
-  data.tar.gz: f6ae921e7cfa279434d37dc835a9e49a4f633820
+  metadata.gz: 8361053e50647bdd9eda90cf1d701dd4e67823c4
+  data.tar.gz: 86bed71e62821663ea47a4209503ef228693592a
 SHA512:
-  metadata.gz: 77bf6dc4495017957515547cf549783c35727342f1f3046f10bb118cdf4f716802c1e5312fb5f670844171bfd8c2adb79ad05286752e4c8d97b9dcf7ce82bb90
-  data.tar.gz: 6f1005482750cd2f3f1e328165e16a24b3f31a9101e20adb84b4f481ac6c39af2250cc2862ca1c51929c61b4c2d23e774c2336556cbdaa903cc81830f01ea9e4
+  metadata.gz: 670aa0ad353180661a50ae027714b5a50203139799269cf141b91292a9e3d438632afea20949ab4a6e726f9f25667bcb1ec6e9bd9f91969e40c621a1d1d95668
+  data.tar.gz: c319e39d3377b8ac4bd55ef451b27bbb3ccf34cd2912cff3f1d8c9ebc398b7a259f77aea7358e00f3abcd028cc25297da8d8af4da0042092deced8b3d838f7f7

data/.gitignore

@@ -58,3 +58,5 @@ tmp/
 .buildpath
 .cache
 
+# Nucleon/CORL related
+.project_cache

data/VERSION

@@ -1 +1 @@
-0.5.17
+0.5.18

data/bootstrap/lib/shell/os.sh

@@ -7,61 +7,63 @@
 # https://github.com/coto/server-easy-install/blob/master/lib/core.sh
 #
 #-------------------------------------------------------------------------------
+# OS Information
 
 function os_info() {
-    OS=`lowercase \`uname\``
-    KERNEL=`uname -r`
-    MACHINE=`uname -m`
+  OS=`lowercase \`uname\``
+  KERNEL=`uname -r`
+  MACHINE=`uname -m`
 
-    #---
+  #---
 
-    if [ "${OS}" == "windowsnt" ]
-    then
-        OS=windows
+  if [ "${OS}" == "windowsnt" ]
+  then
+    OS=windows
     
-    elif [ "${OS}" == "darwin" ]
+  elif [ "${OS}" == "darwin" ]
+  then
+    OS=mac
+  else
+    if [ "${OS}" = "linux" ]
     then
-        OS=mac
-    else
-        if [ "${OS}" = "linux" ]
-        then
-            if [ -f /etc/redhat-release ]
-            then
-                OS=`cat /etc/redhat-release |sed s/\ release.*//`
-                OS_NAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
-                OS_VERSION=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
+      if [ -f /etc/redhat-release ]
+      then
+        OS=`cat /etc/redhat-release | sed s/\ release.*//`
+        OS=`lowercase "$OS"`
+        OS_NAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
+        OS_VERSION=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
             
-            elif [ -f /etc/SuSE-release ]
-            then
-            	OS=suse
-                OS_NAME=`cat /etc/SuSE-release | tr "\n" ' '| sed s/VERSION.*//`
-                OS_VERSION=`cat /etc/SuSE-release | tr "\n" ' ' | sed s/.*=\ //`
+      elif [ -f /etc/SuSE-release ]
+      then
+        OS=suse
+        OS_NAME=`cat /etc/SuSE-release | tr "\n" ' '| sed s/VERSION.*//`
+        OS_VERSION=`cat /etc/SuSE-release | tr "\n" ' ' | sed s/.*=\ //`
         
-            elif [ -f /etc/mandrake-release ]
-            then
-                OS=mandriva
-                OS_NAME=`cat /etc/mandrake-release | sed s/.*\(// | sed s/\)//`
-                OS_VERSION=`cat /etc/mandrake-release | sed s/.*release\ // | sed s/\ .*//`
+      elif [ -f /etc/mandrake-release ]
+      then
+        OS=mandriva
+        OS_NAME=`cat /etc/mandrake-release | sed s/.*\(// | sed s/\)//`
+        OS_VERSION=`cat /etc/mandrake-release | sed s/.*release\ // | sed s/\ .*//`
         
-            elif [ -f /etc/debian_version ]
-            then
-                DIST=`cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F=  '{ print $2 }'`
-                OS_NAME=`cat /etc/lsb-release | grep '^DISTRIB_CODENAME' | awk -F=  '{ print $2 }'`
-                OS_VERSION=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F=  '{ print $2 }'`
-            fi
-            if [ -f /etc/UnitedLinux-release ]
-            then
-                DIST="${DIST}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]"
-            fi
-            OS=`lowercase "$DIST"`
-        fi
+      elif [ -f /etc/debian_version ]
+      then
+        DIST=`cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F=  '{ print $2 }'`
+        OS=`lowercase "$DIST"`
+        OS_NAME=`cat /etc/lsb-release | grep '^DISTRIB_CODENAME' | awk -F=  '{ print $2 }'`
+        OS_VERSION=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F=  '{ print $2 }'`
+         
+      elif [ -f /etc/UnitedLinux-release ]
+      then
+        DIST="${DIST}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]"
+        OS=`lowercase "$DIST"`
+      fi
     fi
+  fi
 }
 
 #-------------------------------------------------------------------------------
 # Utilities
 
 function lowercase() {
-    echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
+  echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
 }
-

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

@@ -15,13 +15,18 @@ fi
 # Set OpenDNS as our DNS lookup source
 echo "3. Setting command DNS gateways"
 echo "nameserver 208.67.222.222" | tee /etc/resolvconf/resolv.conf.d/base > /dev/null || exit 3
+resolvconf -u || exit 4
+
+# Force time update (for systems without a hardware clock / Raspberry Pi)
+echo "4. Forcing system time update"
+ntpdate -s time.nist.gov
 
 # Update system packages
-echo "4. Updating system packages"
+echo "5. Updating system packages"
 apt-get update >/tmp/update.log 2>&1 || exit 5
 
 # Install basic build packages.
-echo "5. Ensuring basic libraries and development utilities"
+echo "6. Ensuring basic libraries and development utilities"
 apt-get -y install build-essential cmake rake bindfs libnl-dev libpopt-dev \
                    libssl-dev libcurl4-openssl-dev libxslt-dev libxml2-dev \
                    libyaml-dev libreadline-dev libncurses5-dev zlib1g-dev texinfo \

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.17 ruby lib
+# stub: corl 0.5.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.17"
+  s.version = "0.5.18"
 
   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-04-29"
+  s.date = "2015-05-11"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]

data/lib/CORL/machine/raspberrypi.rb

@@ -107,7 +107,10 @@ class Raspberrypi < Nucleon.plugin_class(:CORL, :machine)
 
   def reload(options = {})
     super do
-      node.command('reboot', { :as_admin => true })
+      success = node.command('reboot', { :as_admin => true })
+      sleep 5
+      sleep 1 until running?
+      success
     end
   end
 

data/lib/CORL/node/raspberrypi.rb

@@ -14,10 +14,6 @@ class Raspberrypi < Nucleon.plugin_class(:CORL, :node)
   #-----------------------------------------------------------------------------
   # Checks
 
-  def local?
-    false
-  end
-
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
 

data/lib/core/plugin/node.rb

@@ -25,11 +25,10 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
 
     unless reload
       @cli_interface = Util::Liquid.new do |method, args, &code|
-        result = exec({ :commands => [ [ method, args ].flatten.join(' ') ] }) do |op, data|
+        result = command([ method, args ].flatten.join(' '), { :as_admin => true }) do |op, data|
           code.call(op, data) if code
         end
         if result
-          result = result.first
           warn(result.errors, { :i18n => false }) unless result.errors.empty?
         end
         result

data/lib/core/plugin/provisioner.rb

@@ -222,8 +222,21 @@ class Provisioner < Nucleon.plugin_class(:nucleon, :base)
 
     while config.has_key?(:extend) do
       array(config.delete(:extend)).each do |parent|
-        parent = profile_id(package, parent) unless parent.match('::')
+        parent      = profile_id(package, parent) unless parent.match('::')
+        parent_base = parent.sub(/::[^:]+$/, '')
         parents << parent
+
+        if profiles[parent.to_sym].has_key?(:extend)
+          extends = []
+          array(profiles[parent.to_sym][:extend]).each do |extend|
+            if extend.include?('::')
+              extends << extend
+            else
+              extends << "#{parent_base}::#{extend}"
+            end
+          end
+          profiles[parent.to_sym][:extend] = extends
+        end
         config.defaults(profiles[parent.to_sym])
       end
     end

data/lib/nucleon/action/node/fact.rb

@@ -3,43 +3,43 @@ module Nucleon
 module Action
 module Node
 class Fact < Nucleon.plugin_class(:nucleon, :cloud_action)
-  
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe(action = :fact, weight = 570)
     describe_base(:node, action, weight, nil, nil, :node_fact)
   end
-  
+
   #-----------------------------------------------------------------------------
   # Settings
 
   def configure(aggregate = false)
     super() do
       codes :fact_save_failed
-      
+
       unless aggregate
         register_str :name, nil
         register_str :value
-      
-        register_bool :delete      
-      
+
+        register_bool :delete
+
         register_translator :input_format
       end
-      
+
       register_translator :format, :json
     end
   end
-  
+
   #---
-  
+
   def arguments
     [ :name, :value ]
   end
 
   #-----------------------------------------------------------------------------
   # Operations
-   
+
   def execute
     super do |node|
       ensure_node(node) do
@@ -47,9 +47,9 @@ class Fact < Nucleon.plugin_class(:nucleon, :cloud_action)
           render_node_facts(node)
         else
           if settings.delete(:delete, false)
-            delete_node_fact(node, settings[:name], sanitize_remote(network, settings[:net_remote]))                
+            delete_node_fact(node, settings[:name], sanitize_remote(settings[:net_remote]))
           elsif settings[:value] && ! settings[:value].empty?
-            set_node_fact(node, settings[:name], settings[:value], sanitize_remote(network, settings[:net_remote]))
+            set_node_fact(node, settings[:name], settings[:value], sanitize_remote(settings[:net_remote]))
           else
             render_node_fact(node, settings[:name])
           end
@@ -57,64 +57,64 @@ class Fact < Nucleon.plugin_class(:nucleon, :cloud_action)
       end
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Sub operations
-  
+
   def render_node_facts(node)
     format        = settings[:format]
-    myself.result = node.facts        
-    render result, :format => format  
+    myself.result = node.facts
+    render result, :format => format
   end
-  
+
   #---
-  
+
   def render_node_fact(node, name)
     format        = settings[:format]
-    myself.result = node.fact(name)    
-    render result, :format => format 
+    myself.result = node.fact(name)
+    render result, :format => format
   end
-  
+
   #---
-  
+
   def delete_node_fact(node, name, remote = nil)
     remote_text = remote ? "#{remote}" : "LOCAL ONLY"
-    
+
     node.delete_facts(name)
-            
+
     if node.save({ :remote => remote, :message => "Deleting fact #{name} from #{node.plugin_provider} #{node.plugin_name}" })
       success("Fact #{name} deleted (#{remote_text})", { :i18n => false })
     else
       error("Fact #{name} deletion could not be saved", { :i18n => false })
-      myself.status = code.fact_save_failed  
-    end  
+      myself.status = code.fact_save_failed
+    end
   end
-  
+
   #---
-  
+
   def set_node_fact(node, name, value, remote = nil)
     remote_text  = remote ? "#{remote}" : "LOCAL ONLY"
     input_format = settings[:input_format]
-    
-    value        = Util::Data.value(render(value, { 
-      :format => input_format, 
-      :silent => true 
+
+    value        = Util::Data.value(render(value, {
+      :format => input_format,
+      :silent => true
     })) if input_format
-            
-    myself.result = value           
-    node.create_facts({ name => value })    
-            
+
+    myself.result = value
+    node.create_facts({ name => value })
+
     if node.save({ :remote => remote, :message => "Saving fact #{name} to #{node.plugin_provider} #{node.plugin_name}" })
       success("Fact #{name} saved (#{remote_text})", { :i18n => false })
     else
       error("New fact #{name} could not be saved", { :i18n => false })
-      myself.status = code.fact_save_failed  
-    end  
+      myself.status = code.fact_save_failed
+    end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Output
-  
+
   def render_provider
     :node_fact
   end

data/lib/nucleon/action/node/identity.rb

@@ -93,12 +93,26 @@ class Identity < Nucleon.plugin_class(:nucleon, :cloud_action)
             result  = node.cli.mkdir('-p', remote_identity_base_directory)
             success = false unless result.status == code.success
 
+            success = node.cli.chmod('-R', 'go-rwx', remote_config_directory) if success
+
             if success
               result  = node.cli.rm('-Rf', remote_identity_directory)
               success = false unless result.status == code.success
 
               # Send identity through SCP to remote machine
-              success = node.send_files(identity_directory, remote_identity_directory, nil, '0700') if success && ! settings[:delete]
+              if success && !settings[:delete]
+                if node.user == 'root'
+                  success = node.send_files(identity_directory, remote_identity_directory, nil, '0700')
+                else
+                  tmp_identity_directory = File.join('/', 'home', node.user, 'identity')
+
+                  success = node.send_files(identity_directory, tmp_identity_directory, nil, '0700') if success
+
+                  success = node.cli.mv(tmp_identity_directory, remote_identity_directory) if success
+                  success = node.cli.chown('-R', 'root:root', remote_identity_directory) if success
+                  success = node.cli.chmod('-R', 'go-rwx', remote_identity_directory) if success
+                end
+              end
             end
             success
           end

data/lib/puppet/indirector/corl.rb

@@ -2,26 +2,26 @@
 require 'puppet/indirector/terminus'
 
 class Puppet::Indirector::Corl < Puppet::Indirector::Terminus
-  
+
   def initialize(*args)
     node = CORL::Provisioner::Puppetnode.node
-    
+
     unless node.config_initialized?
       raise "CORL terminus not supported without the CORL library"
     end
     super
   end
-  
+
   #---
 
   def find(request)
     node         = CORL::Provisioner::Puppetnode.node
-        
+
     puppet_scope = request.options[:variables]
     module_name  = nil
     module_name  = puppet_scope.source.module_name if puppet_scope.source
     contexts     = [ :param, :data_binding, request.key ]
-    
+
     default_options = {
       :provisioner     => :puppetnode,
       :hiera_scope     => puppet_scope,
@@ -32,9 +32,9 @@ class Puppet::Indirector::Corl < Puppet::Indirector::Terminus
       :merge           => true,
       :undefined_value => :undef
     }
-    
+
     if module_name
-      config = CORL::Config.init({}, contexts, module_name, default_options)  
+      config = CORL::Config.init({}, contexts, module_name, default_options)
     else
       config = CORL::Config.init_flat({}, contexts, default_options)
     end

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

@@ -18,22 +18,22 @@ This function performs a lookup for a variable value in various locations follow
 If no value is found in the defined sources, it returns an empty string ('')
     EOS
 ) do |args|
-    
+
     value = nil
     CORL.run do
       raise(Puppet::ParseError, "module_param(): Define at least the variable name " +
         "given (#{args.size} for 1)") if args.size < 1
-      
+
       var_name = args[0]
       default  = ( args.size > 1 ? args[1] : '' )
       options  = ( args.size > 2 ? args[2] : {} )
-    
+
       module_name = parent_module_name
       node        = CORL::Provisioner::Puppetnode.node
-      
+
       if module_name
         module_var_name = "#{module_name}::#{var_name}"
-        
+
         config = CORL::Config.init(options, [ :param, :module_param, var_name ], module_name, {
           :provisioner     => :puppetnode,
           :hiera_scope     => self,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon