corl 0.4.23 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9f1651b77d15462f9a7c1951cdd5764d98b4499
-  data.tar.gz: e14e2dc2e1e723ff80a966c9c198d7677084985e
+  metadata.gz: e6bf577243e8547180dfba960639bf2bc4a924f2
+  data.tar.gz: 2f0100c0679d386c62dcf9f1cba831970ffb4087
 SHA512:
-  metadata.gz: 9b9ac46be10b8bde82c7cafa62de05f1b54975d886027dac63edd8ae080a1095f3b964fa4a31e72d8ba1624b115a52acfb0cccff63699926da4144e208e17537
-  data.tar.gz: 363e2bd24af39522e8fffcabd95af09a01710770ffafb0518d18fba3f1df44937505b377e615dfaa03b06f521e1882306458bd5657c09e0e0da22194df0d062b
+  metadata.gz: 6d823a375d6e2a76a795e38514e5123d48f39a1fac58ef3c641aa47669b65641748238a1b368a4e582013af530b664cc031bde58ac687bee7de83e7f484f83a7
+  data.tar.gz: 1dba62d74a618462531a2449ab0b80c51127dd82b794ee26c8f67841c10d0bf9dfa7f2c1bfe37eef72adcbfa2bf439e35d603453b65b7c854eb7f7cb61598d2e

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.4.23
+0.4.24

data/bin/corl

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

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.23 ruby lib
+# stub: corl 0.4.24 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.23"
+  s.version = "0.4.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/CORL/provisioner/puppetnode.rb

@@ -4,6 +4,14 @@ class Puppetnode < CORL.plugin_class(:provisioner)
   
   @@puppet_lock = Mutex.new
   
+  #---
+  
+  @@status = {}
+  
+  def self.status
+    @@status
+  end
+  
   #-----------------------------------------------------------------------------
   # Provisioner plugin interface
    
@@ -30,7 +38,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
             level = levels[msg.level]
             
             if [ :warn, :error ].include?(level[:send])
-              myself.status = 111
+              ::CORL::Provisioner::Puppetnode.status[name] = 111
             end
         
             CORL.ui_group("puppetnode::#{name}(#{CORL.yellow(level[:name])})", :cyan) do |ui|
@@ -256,7 +264,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
         begin
           ui.info("Starting catalog generation")
           
-          myself.status = code.success
+          @@status[id] = code.success
           
           start_time = Time.now
           node = init_puppet(profiles)
@@ -295,7 +303,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
           Puppet.log_exception(error)
         end
       end
-      success = false if myself.status != code.success
+      success = false if @@status[id] != code.success
       success
     end
   end

metadata

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