dtk-node-agent 0.5.14 → 0.5.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjFjZjU5ZjIwYWM2NDYyNmExNDM1MzI5ZGEzYTQwYWE5Mzc4Y2JkZQ==
-  data.tar.gz: !binary |-
-    NTdkZTBkZTY5YjM2ZDcwMWRhZmVkYTc0MTk2YzkxZDVkYmI4MGNkZg==
+SHA1:
+  metadata.gz: 66132611a40d998867d1dd8ec4cd86a47d8cda1b
+  data.tar.gz: 9ed30e7ef2172f4590367ca5c6dc21dc0ada2ad3
 SHA512:
-  metadata.gz: !binary |-
-    MGFlMDRiMjY2MmZhYTk1ZjNmMzNjMjY3MDA0YWU4NmUyN2FmMjQzZDk1M2Ux
-    OTQ0Nzc0NWU5YmYyOWFlYTI3NTE4ZDIxYWVmZjZhMWIzZTkyNDRmMjMxYzVh
-    YzMzMTNjY2Q2Mjg0NTk0MTYzMDZlYjUzMGJhNzRlNTA1ZDA1ZTY=
-  data.tar.gz: !binary |-
-    YzNjODhlNzVmOWYxYWZmMWE2ZDVjZjg5ZDlkZmNhNDg0MGM1NTFkODVhNzNl
-    OGI1ODI3YjhiYjc5YjRkMTgzNGJmMmMzMWJhZmY4Y2ZiMTU3Zjc5MTgzM2Rm
-    NThmOTBlZDE3NDQ0YTU5MmMxMTBiZWFlMDExMTc1MzNiZTFiMmQ=
+  metadata.gz: b9fdae9f7469c55b728d01e974985b45d332b4264f50561f67acc76bb2130adb85e96f83c9451192909ca5838cffaed8f1c122ee63343de89eeab017d0d6e83f
+  data.tar.gz: 2100a2a17c316444105d1722c0a3a3f41179f3ac13583282e773f3805ce6644828af911cc8bb8207b442ad64035aacac5cb66be15e85d7876780e3266619c980

data/README.md

@@ -10,7 +10,7 @@ Code that is present in AMIs that server basis for nodes being spun up
 `sudo dtk-node-agent`
 
 #### Intalling the node agent on a running machine (with puppet omnibus)
-`sudo ./install_agent.sh`
+`sudo ./install_agent.sh [--sanitize]`
 
 #### Create a new AMI image with the node agent
 ```

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

@@ -31,7 +31,7 @@ module DTK
               puts "Installing MCollective..."
               shell "apt-get -y install mcollective"
             elsif Facter.operatingsystem == 'CentOS' || Facter.operatingsystem == 'RedHat'
-              shell "yum -y install yum-utils wget"
+              shell "yum -y install yum-utils wget bind-utils"
               case Facter.operatingsystemmajrelease
               when "5"
                 shell "rpm -ivh #{CONFIG[:puppetlabs_el5_rpm_repo]}"
@@ -50,10 +50,12 @@ module DTK
               shell "chkconfig mcollective on"
               shell "yum -y install git"
               # install ec2-run-user-data init script
-              FileUtils.cp("#{base_dir}/src/etc/init.d/ec2-run-user-data", "/etc/init.d/ec2-run-user-data") unless File.exist?("/etc/init.d/ec2-run-user-data")
-              shell "chmod +x /etc/init.d/ec2-run-user-data"
-              shell "chkconfig --level 345 ec2-run-user-data on"
-
+              # but only if the machine is running on AWS
+              if `host instance-data.ec2.internal`.include? 'has address'
+                FileUtils.cp("#{base_dir}/src/etc/init.d/ec2-run-user-data", "/etc/init.d/ec2-run-user-data") unless File.exist?("/etc/init.d/ec2-run-user-data")
+                shell "chmod +x /etc/init.d/ec2-run-user-data"
+                shell "chkconfig --level 345 ec2-run-user-data on"
+              end
             else
               echo "Unsuported OS for automatic agent installation. Exiting now..."
               exit(1)

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.5.14"
+  VERSION="0.5.15"
 end

data/mcollective_additions/plugins/v2.2/agent/execute_tests_v2.ddl

@@ -0,0 +1,9 @@
+metadata    :name        => "component module tests executor v2",
+            :description => "Agent to executing component module infrastructure tests v2",
+            :author      => "Reactor8",
+            :license     => "",
+            :version     => "",
+            :url         => "",
+            :timeout     => 10
+action "execute_tests_v2", :description => "execute all component module infrastructure tests v2" do
+end

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

@@ -0,0 +1,115 @@
+require 'rspec'
+require 'rspec/core'
+require 'rspec/core/formatters/json_formatter'
+require 'json'
+
+ModulePath = "/etc/puppet/modules"
+ServerspecPath = "serverspec/spec/localhost"
+
+module MCollective
+  module Agent
+    class ServerSpecHelper
+      def execute(spec_path, vars=[])
+        vars.each do |var|
+          var.each_pair do |k,v|
+            Thread.current[k] = v
+          end
+        end
+
+        config = RSpec.configuration
+        json_formatter = RSpec::Core::Formatters::JsonFormatter.new(config.output)
+        reporter =  RSpec::Core::Reporter.new(json_formatter)
+        config.instance_variable_set(:@reporter, reporter)
+        ::RSpec::Core::Runner.run([spec_path,'--format','j'])
+        json_formatter.output_hash
+      end
+    end
+
+    class Execute_tests_v2 < RPC::Agent
+      def initialize()
+        super()
+        @log = Log.instance
+      end
+
+      def pull_modules(module_version_context, git_server)
+        ENV['GIT_SHELL'] = nil #This is put in because if vcsrepo Puppet module used it sets this
+        begin
+          repo_dir = "#{ModulePath}/#{module_version_context[:implementation]}"
+          remote_repo = "#{git_server}:#{module_version_context[:repo]}"
+          opts = Hash.new
+          begin
+            if File.exists?(repo_dir)
+              @log.info("Branch already exists. Checkout to branch and pull latest changes...")
+              git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir)
+              git_repo.pull_and_checkout_branch?(module_version_context[:branch],opts)
+            else
+              @log.info("Branch does not exist. Cloning branch...")
+              git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir,:create=>true)
+              git_repo.clone_branch(remote_repo,module_version_context[:branch],opts)
+            end
+          rescue Exception => e
+            log_error(e)
+            #to achieve idempotent behavior; fully remove directory if any problems
+            FileUtils.rm_rf repo_dir
+            raise e
+          end
+        rescue Exception => e
+          log_error(e)
+        end
+      end
+
+      def log_error(e)
+        log_error = ([e.inspect]+e.backtrace).join("\n")
+        @log.info("\n----------------error-----\n#{log_error}\n----------------error-----")
+      end
+
+      action "execute_tests_v2" do
+        spec_helper = ServerSpecHelper.new
+        all_tests = Dir["#{ModulePath}/*/#{ServerspecPath}/*.rb"]
+        all_spec_results = []
+
+        #Pull latest changes for modules if any
+        git_server = Facts["git-server"]
+
+        begin
+          request[:components].each do |component|
+            #Filter version context for modules that exist on node
+            filtered_version_context = request[:version_context].select { |x| x[:implementation] == component[:module_name] }.first
+            pull_modules(filtered_version_context,git_server)
+
+            test = all_tests.select { |test| (test.include? component[:test_name]) && (test.include? component[:module_name]) }
+            @log.info("Executing serverspec test: #{test.first}")
+
+            spec_results = spec_helper.execute(test.first, component[:params])
+            component_name = ""
+            if component[:component].include? "/"
+	            component_name = component[:component].split("/").last
+	          else
+	            component_name = component[:component]
+            end
+
+            spec_results[:examples].each do |spec|
+              spec_result = {}
+              spec_result.store(:module_name, component[:module_name])
+              spec_result.store(:component_name, component_name)
+              spec_result.store(:test_component_name, component[:test_component])
+              spec_result.store(:test_name, component[:test_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
+      end
+    end
+  end
+end

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

@@ -212,7 +212,7 @@ module MCollective
         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
+          if last_line = `tail -1 "#{log_file_path}"`
             #TODO: might be more general pattern to search
             if last_line =~ /^.+Puppet \(err\):\s*(.+$)/
               $1

data/mcollective_additions/plugins/v2.2/facts/pbuilder_facts.rb

@@ -8,12 +8,14 @@ module MCollective
     class Pbuilder_facts < Base
 
       def load_facts_from_source
-        ret = {"pbuilderid" => get_pbuilderid()}
+        # ret = {"pbuilderid" => get_pbuilderid()}
+        ret = {}
         yaml_file = '/etc/mcollective/facts.yaml'
         if File.exists?(yaml_file)
           yaml_facts = YAML.load_file(yaml_file)
           ret.merge!(yaml_facts)
         end
+        ret.merge!("pbuilderid" => get_pbuilderid()) unless ret.keys.include?('pbuilderid')
         ret
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -145,6 +145,8 @@ files:
 - mcollective_additions/plugins/v2.2/agent/dtk_node_agent_git_client.rb
 - mcollective_additions/plugins/v2.2/agent/execute_tests.ddl
 - mcollective_additions/plugins/v2.2/agent/execute_tests.rb
+- mcollective_additions/plugins/v2.2/agent/execute_tests_v2.ddl
+- mcollective_additions/plugins/v2.2/agent/execute_tests_v2.rb
 - mcollective_additions/plugins/v2.2/agent/get_log_fragment.ddl
 - mcollective_additions/plugins/v2.2/agent/get_log_fragment.rb
 - mcollective_additions/plugins/v2.2/agent/git_access.ddl
@@ -191,12 +193,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: []