dtk-node-agent 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 85f8d6ff17f511126ef50045eb00df6ed4927c03
-  data.tar.gz: d3cc6438de22cd32cf8e2468261ead9071e798c0
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODVhMGY3YTdhZWQwN2Q4ZTZmMmI5ODgzYzNiNTkxMTRiYzg4MjkyNg==
+  data.tar.gz: !binary |-
+    NTI5NDk3NGUyOTIyZTI5ZjNlZmNkMDNkMTg4ZGJkNDE5YmYwNDRjMg==
 SHA512:
-  metadata.gz: 9d8cc97113aecaddb6c42857979e32822816b3999c80699e6bb65a56e356c11dfab5c23a1495362654e73404d9e2c03dadd5b22cfbe1a0dbaa12786ac2bcb5d2
-  data.tar.gz: c88deee409b86539366a253c4174e063dadfb6a30f3f2c5c31c781853415f412955b49a0fab5b12bec0f454a30cf4c6beff83b7a719a2369051bd1e9e3eb2ddf
+  metadata.gz: !binary |-
+    ZjI2MzM4M2M4NDA2OTZmNjA1ZjNlYjA2OWMwYTk0MTY2ZjYyZTA0YmZmZTMz
+    NzY0ODUwYmMxMzQzYWVmMDYzYmJlZThjN2RkYzE3YWM3NTdlNWYyNTZlOWVh
+    MGI3MzZhYjk2NmMzOTkzYTY0MjFlNTdhZGQwOTY2YTE3NWU2Y2M=
+  data.tar.gz: !binary |-
+    MzYyNWRkN2NlMTU4MWJkNGY3OGVhNzhmNWQ2OTg0ZDk2M2I0ZmY2ZWIyZjcx
+    MjIxMTFhYmI0NWNkOTNlMmMxNzBiYzBjZGU4YTUwZjA0OTJlNDM5NDViNTJj
+    YzllNWNmMDBiMzQ3Y2U1N2Q3NjgxZjcwYmMwOTJiYmNiYjQ0MjQ=

data/lib/dtk-node-agent/version.rb

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.6.6"
+  VERSION="0.6.7"
 end

data/mcollective_additions/plugins/v2.2/agent/git_access.rb

@@ -21,19 +21,8 @@ module MCollective
             File.open(rsa_pub_path,"w"){|f|f.print request[:agent_ssh_key_public]}
           end
 
-          #create or append if key not there
-          skip = nil
-          fp = request[:server_ssh_rsa_fingerprint]
-          if File.exists?(known_hosts)
-            fp_key = (fp =~ Regexp.new("^[|]1[|]([^=]+)=");$1)
-            if fp_key
-              fp_key_regexp =  Regexp.new("^.1.#{fp_key}")
-              skip = !!File.open(known_hosts){|f|f.find{|line|line =~ fp_key_regexp}} 
-            end
-          end
-          unless skip
-            File.open(known_hosts,"a"){|f|f.print request[:server_ssh_rsa_fingerprint]}
-          end
+          # add rsa_fingerprint to known hsots; server logic makes sure that is not requested twice so no duplicates
+          File.open(known_hosts,"a"){|f|f.print request[:server_ssh_rsa_fingerprint]}
 
           reply.data   = { :status => :succeeded}
          rescue Exception => e

data/mcollective_additions/plugins/v2.2/agent/puppet_apply.rb

@@ -139,6 +139,7 @@ module MCollective
         Thread.current[:task_id] = task_id
         clean_state()
         ret = nil
+        runtime_errors = nil # in contast to compile errors
         # TODO: harmonize request[:top_task_id] and top_task_id()
         dtk_puppet_cache = DTKPuppetCache.new(@service_name,top_task_id())
         log_file_path = dtk_puppet_cache.log_file_path(inter_node_stage)
@@ -199,18 +200,20 @@ module MCollective
           return_code = ((report_status == :failed || report_info[:errors]) ? 1 : exit_status)
           ret ||= Response.new()
           if return_code == 0
-            if dynamic_attributes = process_dynamic_attributes?(cmps_with_attrs)
-              @log.info("dynamic_attributes = #{dynamic_attributes.inspect}")
-              ret.set_dynamic_attributes!(dynamic_attributes)
+            if dynamic_attr_info = has_dynamic_attributes?(cmps_with_attrs)
+              @log.info("dynamic_attributes = #{dynamic_attr_info.inspect}")
+              process_dynamic_attributes!(ret,dynamic_attr_info)
+            else
+              ret.set_status_succeeded!()
             end
-            ret.set_status_succeeded!()
           else
             ret.set_status_failed!()
             error_info = {
               :return_code => return_code            
             }
-            error_info.merge!(:errors => report_info[:errors]) if (report_info||{})[:errors]
-            error_info[:errors].each { |error| error["type"] = "user_error" } if error_info[:errors]
+            if runtime_errors = (report_info||{})[:errors]
+              error_info[:errors] = runtime_errors.map{|e|e.merge(:type => "user_error")}
+            end
             ret.merge!(error_info)
           end
          rescue Exception => e
@@ -233,11 +236,14 @@ module MCollective
             stderr_msg = stderr_capture.read
             stderr_capture.close
             stderr_capture.unlink
-            if err_message = compile_error_message?(return_code,stderr_msg,log_file_path)
-              ret[:errors] = (ret[:errors]||[]) + [{:message => err_message, :type => "user_error" }]
-              ret.set_status_failed!()
-              Puppet::err stderr_msg 
-              Puppet::info "(end)"
+            # dont look for compile errors if runtime errors
+            unless runtime_errors
+              if err_message = compile_error_message?(return_code,stderr_msg,log_file_path)
+                ret[:errors] =  [{:message => err_message, :type => "user_error" }]
+                ret.set_status_failed!()
+                Puppet::err stderr_msg 
+                Puppet::info "(end)"
+              end
             end
           end
           Puppet::Util::Log.close_all()
@@ -249,12 +255,20 @@ module MCollective
         if stderr_msg and not stderr_msg.empty?
           stderr_msg
         elsif return_code != 0
-          if last_line = `tail -1 "#{log_file_path}"`
-            #TODO: might be more general pattern to search
-            if last_line =~ /^.+Puppet \(err\):\s*(.+$)/
-              $1
+          rest_reverse = Array.new
+          error = nil
+          begin 
+            File.open(log_file_path).read.split("\n").reverse_each do |line|
+              if line =~ /^.+Puppet \(err\):\s*(.+$)/
+                error = $1
+                break
+              else
+                rest_reverse << line
+              end
             end
+           rescue 
           end
+          ([error || 'Puppet catalog compile error'] + rest_reverse.reverse).join("\n")
         end
       end
 
@@ -385,21 +399,60 @@ module MCollective
         end
       end
 
-      def process_dynamic_attributes?(cmps_with_attrs)
-        ret = Array.new
-        cmps_with_attrs.each do |cmp_with_attrs|
-          dyn_attrs = cmp_with_attrs["dynamic_attributes"]
-          if dyn_attrs and not dyn_attrs.empty?
-            cmp_ref = component_ref(cmp_with_attrs)
-            dyn_attrs.each do |dyn_attr|
-              if el = dynamic_attr_response_el(cmp_ref,dyn_attr)
-                ret << el
-              end
+      def has_dynamic_attributes?(cmps_with_attrs)
+        ret = cmps_with_attrs.map do |cmp_with_attrs|
+          dyn_attrs = cmp_with_attrs["dynamic_attributes"]||[]
+          if !dyn_attrs.empty?
+            {
+              :cmp_ref => component_ref(cmp_with_attrs),
+              :dynamic_attrs => dyn_attrs
+            }
+          end
+        end.compact
+        !ret.empty? && ret
+      end
+
+      def process_dynamic_attributes!(ret,dynamic_attr_info)
+        dyn_attr_assigns = Array.new
+        missing_dyn_attrs = Array.new
+        dynamic_attr_info.each do |info|
+          cmp_ref = info[:cmp_ref]
+          info[:dynamic_attrs].each do |dyn_attr|
+            if dyn_attr_assign = dynamic_attr_response_el(cmp_ref,dyn_attr)
+              dyn_attr_assigns << dyn_attr_assign
+            else
+              missing_attr = {
+                :cmp_ref => cmp_ref,
+                :attr => dyn_attr[:name]
+              }
+              missing_dyn_attrs << missing_attr
             end
           end
         end
-        ret.empty? ? nil : ret
+        if missing_dyn_attrs.empty?
+          ret.set_dynamic_attributes!(dyn_attr_assigns)
+          ret.set_status_succeeded!()
+        else
+          set_error_missing_dynamic_attrs!(ret,missing_dyn_attrs)
+          ret.set_status_failed!()
+        end
+      end
+
+      def set_error_missing_dynamic_attrs!(ret,missing_dyn_attrs)
+        errors = missing_dyn_attrs.map do |info|
+          err_message = "Dynamic Attribute (#{info[:attr]}) is not set by component (#{info[:cmp_ref]})"
+          {
+            :message => err_message,
+            :type => "user_error"
+          }
+        end
+        error_info = {
+          :return_code => 1,
+          :errors => errors
+        }
+        ret.merge!(error_info)
       end
+
       def dynamic_attr_response_el(cmp_name,dyn_attr)
         ret = nil
         val = 
@@ -520,9 +573,10 @@ module MCollective
           cmp_with_attrs["name"]
         when "definition"
           defn = cmp_with_attrs["name"]
-          name_attr_val = (cmp_with_attrs["attributes"].find{|attr|attr["name"]}||{})["value"]
-          raise "Cannot find the name associated with definition #{defn}" unless name_attr_val
-          "#{cmp_with_attrs["name"]}[#{name_attr_val}]"
+          unless name_attr = cmp_with_attrs["attributes"].find{|attr|attr["name"] == "name"}
+            raise "Cannot find the name associated with definition #{defn}"
+          end
+          "#{cmp_with_attrs["name"]}[#{name_attr["value"]}]"
         else
           raise "Reference to type #{cmp_with_attrs["component_type"]} not treated"
         end
@@ -661,7 +715,7 @@ module MCollective
       Thread.current[:report_status] = status.to_sym
     end
     def self.get_status()
-      Thread.current[:report_status]
+      Thread.current[:report_status] || :failed
     end
     def self.set_report_info(report_info)
       Thread.current[:report_info] = report_info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -211,12 +211,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []