dtk-node-agent 0.5.12 → 0.5.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGUwMWQxZTY3ZDA1MWUyOGNkNDI3YWUxZWYxNjhkYzUwY2JlZTBkMA==
+    Yjk2YmU2OTNiNGIzNTUyZTFlNzc0NzY0OWY5ODdjMTIzODgxM2M2Ng==
   data.tar.gz: !binary |-
-    ODc0NTA0ZDRkMzQxZmI1ODkyNTIyNDliOWRiZGM3OTRjMjcwM2Q0Yw==
+    ZGNhNmM3NzdhZjcwZTBjNGYyYzU0ZGRhYTgzYzViMzFiZjNkZDM1Nw==
 SHA512:
   metadata.gz: !binary |-
-    MDIxZWIzNmEzYzNmNTk1N2U5ZjcyNDkyNDhjMDExNTYwMmFhNzhiODk0YmVm
-    YTkzZGRjZDJiZDg5MmVhOWE1NGU2MGQ4YjMwMGY4YjQ0YzIzMDNiMTA3MWJh
-    Yzc3NGIwYjdiMzU4M2Q4NDNjNzI5YTg4YzM0YWI2NGY0N2VlODE=
+    ODVkYjVjY2ZjNWI5ZGVlMDJlZWRjYTM4OWE1YzhhMGY3MTQxOWYzZjU2ZWEz
+    ZTkwODg3OWMwMjA1ZTYxMjU0YmNjYTM4MDY2MWZjY2Y2NmQ2OGVkMjAwZjUz
+    MmFjYzE1MzgyYzllYjdmODhmY2NjYmU4MjQyMWJmM2IzZTEwOTk=
   data.tar.gz: !binary |-
-    OGViMTNmMTc3ODkzYmQ0YzA5YzYwODNhMjYzOTViMDA2YmRkNzZjYmI4YzZk
-    YTkxMzJjODYxNTRhYmQwYzZhMGEwNjAxMzk0NTI0NzQyYjRkODFiMTQ5NGJi
-    MzAwNjFkMTFiYjgyZjc5M2QyNTgxMmRmYzdhOGU5Njg3NDA4ODY=
+    NjA5MTIyNjQ3ZTllODdiMWVjOGYxYjdjMTdlNmRiZTkzM2MwMWQ3NGU1ZmVj
+    YjY3YzA3YTJhMWRlZjZlZTc2NTcyZTc1Nzg1ZTEzZTFlZTY3MDRhNGViOWQ4
+    ZTBmYmFmNDczODhkNzUyZWNjZDNiMDlhODZmZjk3ZDBhMTVmMDA=

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.5.12"
+  VERSION="0.5.13"
 end

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

@@ -73,31 +73,38 @@ module MCollective
         #Pull latest changes for modules if any
         git_server = Facts["git-server"]
 
-        modules_info.each do |module_info|
-          component_module = module_info[:module_name]
-          component_name = module_info[:component_name]
-          full_component_name = module_info[:full_component_name]
-          #Filter out version context for modules that don't exist on node
-          filtered_version_context = request[:version_context].select { |x| x[:implementation] == module_info[:module_name] }.first
-          pull_modules(filtered_version_context,git_server)       
+        begin
+          modules_info.each do |module_info|
+            component_module = module_info[:module_name]
+            component_name = module_info[:component_name]
+            full_component_name = module_info[:full_component_name]
+            #Filter out version context for modules that don't exist on node
+            filtered_version_context = request[:version_context].select { |x| x[:implementation] == module_info[:module_name] }.first
+            pull_modules(filtered_version_context,git_server)
 
-          spec_results=`/opt/puppet-omnibus/embedded/bin/rspec /etc/puppet/modules/#{component_module}/dtk/serverspec/spec/localhost/#{component_name}/*_spec.rb --format j`
-          @log.info("Executing serverspec test: /etc/puppet/modules/#{component_module}/dtk/serverspec/spec/localhost/#{component_name}/*_spec.rb")
+            @log.info("Executing serverspec test: /etc/puppet/modules/#{component_module}/dtk/serverspec/spec/localhost/#{component_name}/*_spec.rb")
+            spec_results=`/opt/puppet-omnibus/embedded/bin/rspec /etc/puppet/modules/#{component_module}/dtk/serverspec/spec/localhost/#{component_name}/*_spec.rb --format j 2>&1`
+            raise spec_results unless spec_results_json = JSON.parse(spec_results)
 
-          spec_results_json = JSON.parse(spec_results)
-          spec_results_json['examples'].each do |spec|
-            spec_result = {}
-            spec_result.store(:module_name, component_module)
-            spec_result.store(:component_name, full_component_name)
-            spec_result.store(:test_result, spec['full_description'])
-            spec_result.store(:status, spec['status'])
-            all_spec_results << spec_result
+            spec_results_json['examples'].each do |spec|
+              spec_result = {}
+              spec_result.store(:module_name, component_module)
+              spec_result.store(:component_name, full_component_name)
+              spec_result.store(:test_result, spec['full_description'])
+              spec_result.store(:status, spec['status'])
+              all_spec_results << spec_result
+            end
           end
+          reply[:data] = all_spec_results
+          reply[:pbuilderid] = Facts["pbuilderid"]
+          reply[:status] = :ok
+        rescue Exception => e
+          @log.info("Error while executing serverspec test")
+          @log.info(e.message)
+          reply[:data] = { :test_error => "#{e.message.lines.first}" }
+          reply[:pbuilderid] = Facts["pbuilderid"]
+          reply[:status] = :notok
         end
-
-        reply[:data] = all_spec_results
-        reply[:pbuilderid] = Facts["pbuilderid"]
-        reply[:status] = :ok
       end
     end
   end

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

@@ -10,8 +10,8 @@ module MCollective
                   :timeout     => 2
       action "get_tcp_udp" do 
         output = `netstat -nltpu`
-        results = output.scan(/(^[a-z0-9]+)\s+(\d)\s+(\d)\s+([0-9:.*]+)\s+([0-9:.*]+)\s+(LISTEN)?\s+([0-9a-zA-Z\/\-: ]+)/m)
-
+        results = output.scan(/(^[a-z0-9]+)\s+(\d)\s+(\d)\s+([a-z0-9:.*]+)\s+([0-9:.*]+)\s+(LISTEN)?\s+([0-9a-zA-Z\/\-: ]+)/m)
+        
         netstat_result = []
         results.each do |result|
           netstat_packet = {}

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

@@ -196,8 +196,8 @@ module MCollective
             stderr_msg = stderr_capture.read
             stderr_capture.close
             stderr_capture.unlink
-            if stderr_msg and not stderr_msg.empty?
-              ret[:errors] = (ret[:errors]||[]) + [{:message => stderr_msg, :type => "user_error" }]
+            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)"
@@ -208,6 +208,19 @@ module MCollective
         ret 
       end
 
+      def compile_error_message?(return_code,stderr_msg,log_file_path)
+        if stderr_msg and not stderr_msg.empty?
+          stderr_msg
+        elsif return_code != 0
+          if last_line = File.open(log_file_path).lines.map{|l|l}.last
+            #TODO: might be more general pattern to search
+            if last_line =~ /^.+Puppet \(err\):\s*(.+$)/
+              $1
+            end
+          end
+        end
+      end
+
       def backtrace_subset(e)
         e.backtrace[0..10]
       end

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

@@ -75,7 +75,7 @@ module MCollective
       end
 
       def does_user_exist?(system_user)
-        !File.open('/etc/passwd').grep(/home\/#{system_user}:/).empty?
+        !File.open('/etc/passwd').grep(/^#{system_user}:/).empty?
       end
 
       def key_added?(system_user, pub_key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -116,19 +116,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - Gemfile
 - Gemfile.lock
-- dtk-node-agent.gemspec
+- README.md
 - bin/dtk-node-agent
+- dtk-node-agent.gemspec
 - lib/config/install.config
 - lib/dtk-node-agent/installer.rb
 - lib/dtk-node-agent/version.rb
-- puppet_additions/modules/r8/lib/puppet/type/r8_export_file.rb
-- puppet_additions/modules/r8/manifests/export_variable.rb
-- puppet_additions/puppet_lib_base/puppet/indirector/catalog/r8_storeconfig_backend.rb
-- puppet_additions/puppet_lib_base/puppet/indirector/r8_storeconfig_backend.rb
-- puppet_additions/puppet_lib_base/puppet/indirector/resource/r8_storeconfig_backend.rb
 - mcollective_additions/plugins/README.md
 - mcollective_additions/plugins/v1.2/agent/discovery.rb
 - mcollective_additions/plugins/v1.2/agent/get_log_fragment.ddl
@@ -176,6 +171,11 @@ files:
 - mcollective_additions/plugins/v2.2/security/sshkey.rb
 - mcollective_additions/plugins/v2.2/util/puppetrunner.rb
 - mcollective_additions/server.cfg
+- puppet_additions/modules/r8/lib/puppet/type/r8_export_file.rb
+- puppet_additions/modules/r8/manifests/export_variable.rb
+- puppet_additions/puppet_lib_base/puppet/indirector/catalog/r8_storeconfig_backend.rb
+- puppet_additions/puppet_lib_base/puppet/indirector/r8_storeconfig_backend.rb
+- puppet_additions/puppet_lib_base/puppet/indirector/resource/r8_storeconfig_backend.rb
 - src/etc/init.d/ec2-run-user-data
 - src/etc/logrotate.d/mcollective
 - src/etc/logrotate.d/puppet
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK ndoe agent tool.