dtk-node-agent 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9deb49e5523865f975ea6d80b996de3db3262e81
-  data.tar.gz: 684d5df7570054a2542cc8587dfc17a55cc77ba6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDA2NGNlZDk5MmRkNDA0MDAxNGE2NDA0ZWQ3OGU2YTNjZjk1MTM1NA==
+  data.tar.gz: !binary |-
+    ZmEzMGY2M2MxZWEzNmJmNjVhMGFhMDM0NTkyMjIxNjhlMThlYTQ1ZA==
 SHA512:
-  metadata.gz: 900dbd83fb0df8e84f5d3f4838145c3022fdeb5458b9397a4acd782661bbb48be00c72e94039c31587dc641df3d92bf2a2ff5fb72a75859c24cb779cc15dcc07
-  data.tar.gz: 51d3386fb5289ddfebb287d69b660b5fb003b4f1199128dd9c61b56298301b4cc8ce2b70f3d804ab4e91bf6ebf53f60854de659a960356d9145a65f2f4de1135
+  metadata.gz: !binary |-
+    OWMyYThiN2Q1NzMzN2YxMzI0YzAwNGJjZTA1MDExYmIxOGU3OTA1YTliYjZj
+    ZjUzMWQzMDQ5NTA0MGE2MzYzZmEyNTk5ZmRiNzg0YmM0MTBkNTFkNDQxNzUy
+    YTZkYzZlMjhhZThkODE2OTQwZDBjYzQyMDUzOGNkMzljZTc3Zjc=
+  data.tar.gz: !binary |-
+    OTJlZjM2OWY5ZjNhNzIyODMwMTdlMmIwMjgzODBiMjJkNGNlODFkM2RmNzFj
+    M2IxMzFiYmQ1ZmJhODgwZDVhMWVmZDBlOWUwMDdmOTRhMWE2MjliZDRhZjk4
+    NzhkMDAyNDVkYTNkYjRjNzAyOWZkNDhlYThjMDYyYjZiYWVhMDk=

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

@@ -45,7 +45,6 @@ module DTK
                 shell "rpm -ivh #{CONFIG[:puppetlabs_el5_rpm_repo]}"
                 Facter.architecture == 'X86_64' ? (shell "rpm -ivh #{CONFIG[:rpm_forge_el5_X86_64_repo]}") : (shell "rpm -ivh #{CONFIG[:rpm_forge_el5_i686_repo]}")
               when "6", "n/a"
-                next unless Facter.operatingsystem == "Amazon"
                 shell "rpm -ivh #{CONFIG[:puppetlabs_el6_rpm_repo]}"
                 Facter.architecture == 'X86_64' ? (shell "rpm -ivh #{CONFIG[:rpm_forge_el6_X86_64_repo]}") : (shell "rpm -ivh #{CONFIG[:rpm_forge_el6_i686_repo]}")
                 shell "yum-config-manager --disable rpmforge-release"
@@ -154,4 +153,4 @@ module DTK
 
     end
   end
-end
+end

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.6.0"
+  VERSION="0.6.1"
 end

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

@@ -7,8 +7,9 @@ require 'fileutils'
 require File.expand_path('dtk_node_agent_git_client',File.dirname(__FILE__))
 
 #TODO: move to be shared by agents
-PuppetApplyLogDir = "/var/log/puppet"
-ModulePath =  "/etc/puppet/modules"
+PuppetApplyLogDir           = "/var/log/puppet"
+ModulePath                  =  "/etc/puppet/modules"
+DTKPuppetCacheBaseDir       = "/usr/share/dtk/tasks"
 
 module MCollective
   module Agent
@@ -29,6 +30,7 @@ module MCollective
         log_params()
         @reply_data = nil
         @msg_id = request.uniqid
+        @service_name = request[:service_name] || "UNKNOWN"
         @task_info = [:task_id,:top_task_id].inject({}) do |h,k|
           h.merge(k => request[k])
         end.merge(:msg_id => @msg_id)
@@ -135,10 +137,11 @@ module MCollective
         # Amar: Added task ID to current thread, so puppet apply can be canceled from puppet_cancel.rb when user requests cancel
         task_id = request[:top_task_id]
         Thread.current[:task_id] = task_id
-
         clean_state()
         ret = nil
-        log_file_path = log_file_path()
+        # 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)
         log_file = nil
         begin
           save_stderr = nil
@@ -146,9 +149,8 @@ module MCollective
           log_file = File.open(log_file_path,"a")
           log_file.close
           Puppet[:autoflush] = true
-          most_recent_link = most_recent_file_path()
-          File.delete(most_recent_link) if File.exists? most_recent_link
-          File.symlink(log_file_path,most_recent_link)
+          most_recent_link = puppet_last_log_link()
+          ln_s(log_file_path,most_recent_link)
 
           # Amar: Node manifest contains list of generated puppet manifests
           #       This is done to support multiple puppet calls inside one puppet_apply agent call
@@ -156,7 +158,13 @@ module MCollective
             execute_lines = puppet_manifest || ret_execute_lines(cmps_with_attrs)
             execute_string = execute_lines.join("\n")
             @log.info("\n----------------execute_string------------\n#{execute_string}\n----------------execute_string------------")
-            File.open("/tmp/site_stage#{inter_node_stage}_puppet_invocation_#{i+1}.pp","w"){|f| f << execute_string}
+            task_dir = dtk_puppet_cache.task_dir()
+            # set the link to last_task
+            ln_s(task_dir, dtk_puppet_cache.last_task_link())
+
+            manifest_path = dtk_puppet_cache.node_manifest_path(inter_node_stage,i+1)
+            File.open(manifest_path,"w"){|f| f << execute_string}
+
             cmd_line = 
               [
                "apply", 
@@ -553,11 +561,8 @@ module MCollective
       def log_params()
         @log.info("params: #{request.data.inspect}")
       end
-      
-      def log_file_path()
-        "#{PuppetApplyLogDir}/#{id_info()}.log"
-      end
-      def most_recent_file_path()
+
+      def puppet_last_log_link()
         "#{PuppetApplyLogDir}/last.log"
       end
       def id_info()
@@ -567,6 +572,47 @@ module MCollective
           end
         end.compact.join(":")
       end
+      def top_task_id()
+        "task_id_#{@task_info[:top_task_id] || @task_info[:task_id] || 'task' }"
+      end
+
+      def ln_s(target,link)
+        File.delete(link) if File.exists? link
+        FileUtils.ln_s(target,link,:force => true)
+      end
+
+      class DTKPuppetCache
+        BaseDir = DTKPuppetCacheBaseDir
+        def initialize(service_name,top_task_id)
+          @service_name = service_name
+          @top_task_id = top_task_id
+        end
+
+        def task_dir()
+          @task_dir ||= mkdir_p("#{base_dir()}/#{@service_name}/#{@top_task_id}")
+        end
+
+        def log_file_path(stage)
+          "#{task_dir()}/stage-#{stage}-puppet.log"
+        end
+        def node_manifest_path(stage,invocation)
+          "#{task_dir()}/site-stage-#{stage}-invocation-#{invocation}.pp"
+        end
+
+        def last_task_link()
+          "#{base_dir()}/last-task"
+        end
+
+       private
+        def base_dir()
+          @base_dir ||= mkdir_p(BaseDir)
+        end
+        
+        def mkdir_p(dir_path)
+          FileUtils.mkdir_p(dir_path)
+          dir_path
+        end
+      end
 
       #TODO: this should be common accross Agents
       class Response < Hash

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: stomp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: sshkeyauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
@@ -209,17 +209,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.