corl 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6689cece3da0f0598e2b101e9d830d54f3772fc9
-  data.tar.gz: b82d70a25434a64f1704eec02f5811b9e41283f8
+  metadata.gz: d9f1651b77d15462f9a7c1951cdd5764d98b4499
+  data.tar.gz: e14e2dc2e1e723ff80a966c9c198d7677084985e
 SHA512:
-  metadata.gz: 29952bd940117c67ff3159faddc993dc9d76c2e95ad7a8037e85169caedb1a169a3a5b91960d2d1c893c5d92576bd9dec548f354e96f58bec8e736ca0ef5681d
-  data.tar.gz: 08a1399763d9dbb9865e1642d4ae8769ca1ccb895888ae3e13359518932c364118a3462cfd3f9e23fbf141a8d8e99f751860d2015f2c1855fef3dfe22d568fa3
+  metadata.gz: 9b9ac46be10b8bde82c7cafa62de05f1b54975d886027dac63edd8ae080a1095f3b964fa4a31e72d8ba1624b115a52acfb0cccff63699926da4144e208e17537
+  data.tar.gz: 363e2bd24af39522e8fffcabd95af09a01710770ffafb0518d18fba3f1df44937505b377e615dfaa03b06f521e1882306458bd5657c09e0e0da22194df0d062b

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.4.22)
+    corl (0.4.23)
       facter (~> 1.7)
       fog (~> 1.20)
       hiera (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.4.22
+0.4.23

data/bin/corl

@@ -1,3 +1,9 @@
 #!/usr/bin/env ruby
 require 'corl'
-exit(CORL.executable(ARGV, :corl))
+
+if nucleon_locate :vagrant
+  system(*[ 'vagrant', 'corl', ARGV ].flatten)
+  exit($?.exitstatus)
+else
+  exit(CORL.executable(ARGV, :corl))  
+end

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

@@ -15,7 +15,7 @@ esac
 # Set up Puppet Apt repositories
 apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 2>&1 || exit 60
 
-echo -e "deb http://apt.puppetlabs.com $OS_NAME main dependencies\ndeb-src http://apt.puppetlabs.com $OS_NAME main dependencies" | cat > /etc/apt/sources.list.d/corl_puppet.list || exit 61
+echo -e "# corl_puppet\ndeb http://apt.puppetlabs.com $OS_NAME main dependencies\ndeb-src http://apt.puppetlabs.com $OS_NAME main dependencies" | cat > /etc/apt/sources.list.d/corl_puppet.list || exit 61
 chmod 0644 /etc/apt/sources.list.d/corl_puppet.list || exit 62
 
 # Install Puppet

data/corl.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.4.22 ruby lib
+# stub: corl 0.4.23 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.22"
+  s.version = "0.4.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/CORL/action/lookup.rb

@@ -33,8 +33,8 @@ class Lookup < Plugin::CloudAction
   def execute
     super do |node, network|
       ensure_node(node) do
-        property = settings[:property]
-        value    = node.lookup(property)
+        property = settings.delete(:property)
+        value    = node.lookup(property, nil, settings)
       
         ui.info(sprintf("#{property} = %s", value.inspect))
       end

data/lib/CORL/provisioner/puppetnode.rb

@@ -28,6 +28,10 @@ class Puppetnode < CORL.plugin_class(:provisioner)
             str = msg.respond_to?(:multiline) ? msg.multiline : msg.to_s
             str = msg.source == "Puppet" ? str : "#{CORL.blue(msg.source)}: #{str}"
             level = levels[msg.level]
+            
+            if [ :warn, :error ].include?(level[:send])
+              myself.status = 111
+            end
         
             CORL.ui_group("puppetnode::#{name}(#{CORL.yellow(level[:name])})", :cyan) do |ui|
               ui.send(level[:send], str)
@@ -252,6 +256,8 @@ class Puppetnode < CORL.plugin_class(:provisioner)
         begin
           ui.info("Starting catalog generation")
           
+          myself.status = code.success
+          
           start_time = Time.now
           node = init_puppet(profiles)
         
@@ -289,6 +295,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
           Puppet.log_exception(error)
         end
       end
+      success = false if myself.status != code.success
       success
     end
   end

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

@@ -25,7 +25,7 @@ class Launcher < ::Vagrant.plugin("2", :command)
   def execute
     # Set the base command so we can access in any actions executed
     ::CORL::Vagrant.command = ::CORL.handle(self)   
-    ::CORL.executable(@argv - [ "--" ], "vagrant corl")
+    ::CORL.executable(@argv - [ "--" ], "[ vagrant ] corl")
   end
   
   #-----------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - Adrian Webb