dtk-node-agent 0.7.4.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aad9f61073297942166730df0ffdb2188c319c68
-  data.tar.gz: 7808ae91f9347cdf791e92c04f54b0114957d41f
+  metadata.gz: 67738c6472f467c7ab9ba074af7bb4a0235f9992
+  data.tar.gz: 24cfbf7e9347326c224b2de278aad9fb5d6dfe99
 SHA512:
-  metadata.gz: ceb5cadb3bfa6f6bf4c60985ebd543fea6e5caf03119828b2ca49031037c61b3bd269565432f7acefc031bc6c2a3ad7a39da22fd2301c75edc3dc073a20af54d
-  data.tar.gz: 0a92d6933a07860f759af3bbfd0fb95ae9b6528080b0d5bced6bf700098e8a19d02f5c61746e00722ca295fcd700f0df3165b8c90dd3a7787d3492ca63312b85
+  metadata.gz: 88bebb7d0b909a80a3d65c6356693a4fd5515edcb258d34659a9bebb0de7c1182c8fb96918a337323284c6e5861ddb755bf012af773bd33d7222db273c836df9
+  data.tar.gz: d449a271411f1d14654c691484e13041a811f5ffdc23564a2178f2ba71dca3173d88da6e65a3e7f61bd84e589ca30c6e0ffa9f359ed6f431f1ec821902354004

data/README.md

@@ -12,29 +12,6 @@ Code that is present in AMIs that server basis for nodes being spun up
 #### Intalling the node agent on a running machine (with puppet omnibus)
 `sudo ./install_agent.sh [--sanitize]`
 
-#### Create a new AMI image with the node agent
-```
-./create_agent_ami.rb --help
-Options:
-          --region, -r <s>:   AWS Region on which to create the AMI image
-         --aws-key, -a <s>:   AWS Access Key
-      --aws-secret, -w <s>:   AWS Secret Access Key
-  --security-group, -s <s>:   AWS Security group (default: default)
-        --key-pair, -k <s>:   AWS keypair for the new instance
-        --key-path, -e <s>:   Path to the PEM file for ssh access
-    --ssh-username, -u <s>:   SSH Username
-     --ssh-timeout, -t <i>:   Time to wait before instance is ssh ready (seconds) (default: 100)
-          --ami-id, -m <s>:   AMI id which to spin up
-      --image-name, -i <s>:   Name of the new image
-                --help, -h:   Show this message
-```
-
-example:  
-```
-ruby create_agent_ami.rb --region us-east-1 --ami-id ami-da0000aa --key-pair test_key --key-path /somepath/test_key.pem \
---ssh-username root --image-name dtk-agent-ubuntu-precise
-```
-
 #### Build all supported AMI images with [packer](http://www.packer.io/) 
 ```
 export AWS_ACCESS_KEY="your aws access key"

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.7.4.1"
+  VERSION="0.7.5"
 end

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

@@ -1,11 +1,14 @@
 require 'base64'
+require 'tmpdir'
+require 'fileutils'
 
 module MCollective
   module Agent
     class Dev_manager < RPC::Agent
 
       AGENT_MCOLLECTIVE_LOCATION = "#{::MCollective::Config.instance.libdir.join}/mcollective/agent/"
- 
+      DTK_AA_TEMP_DIR = File.join(Dir.tmpdir(), 'dtk-action-agent')
+
       action "inject_agent" do
         begin
 
@@ -14,7 +17,7 @@ module MCollective
           # make sure default `service` command paths are set
           ENV['PATH'] += ":/usr/sbin:/sbin"
 
-          request[:agent_files].each do |k,v|
+          (request[:agent_files]||[]).each do |k,v|
             if v == :deleted
               File.delete("#{AGENT_MCOLLECTIVE_LOCATION}#{k}")
               next
@@ -24,8 +27,37 @@ module MCollective
               file << content
             end
           end
+
           ret.set_status_succeeded!()
 
+          dtk_aa_url    = request[:action_agent_remote_url]
+          dtk_aa_branch = request[:action_agent_branch]
+
+          # DTK Action Agent Sync
+          if dtk_aa_url && dtk_aa_branch
+            begin
+              Log.instance.info("Started DTK Action Agent sync, temp dir '#{DTK_AA_TEMP_DIR}'")
+              output = `git clone #{dtk_aa_url} -b #{dtk_aa_branch} #{DTK_AA_TEMP_DIR}`
+              result = $?
+
+              if result.success?
+                Log.instance.info("Cloned latest code from branch '#{dtk_aa_branch}' for DTK Action Agent.")
+
+                output = `cd #{DTK_AA_TEMP_DIR} && /opt/puppet-omnibus/embedded/bin/gem build #{DTK_AA_TEMP_DIR}/dtk-action-agent.gemspec && /opt/puppet-omnibus/embedded/bin/gem install #{DTK_AA_TEMP_DIR}/dtk-action-agent-*.gem --no-ri --no-rdoc`
+                result = $?
+                if result.success?
+                  Log.instance.info("DTK Action Agent has been successfully update from branch '#{dtk_aa_branch}'")
+                else
+                  Log.instance.error("DTK Action Agent could not be updated, reason: #{output}")
+                end
+              else
+                Log.instance.error("Not able to clone latest code from '#{dtk_aa_url} branch #{dtk_aa_branch}', aborting DTK Action Agent Sync. #{output}")
+              end
+            ensure
+              FileUtils.rm_rf DTK_AA_TEMP_DIR
+            end
+          end
+
           t1 = Thread.new do
             sleep(2)
             Log.instance.info "Initiating mcollective restart..."
@@ -45,6 +77,7 @@ module MCollective
           error_info = { :error => { :message => "Error syncing agents: #{e}" } }
           ret.merge!(error_info)
         end
+
         return ret
       end
     end

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

@@ -15,6 +15,9 @@ DTKPuppetModulePath         = "/usr/share/dtk/puppet-modules"
 module MCollective
   module Agent
     class Puppet_apply < RPC::Agent
+
+      NUMBER_OF_RETRIES = 5
+
       def initialize()
         super()
         @log = Log.instance
@@ -85,12 +88,18 @@ module MCollective
 
             if clean_and_clone
               begin
+                tries ||= NUMBER_OF_RETRIES
                 clean_and_clone_module(puppet_repo_dir, remote_repo,vc[:branch], opts)
                rescue Exception => e
-                # TODO: not used now
-                error_backtrace = backtrace_subset(e)
                 # to achieve idempotent behavior; fully remove directory if any problems
                 FileUtils.rm_rf puppet_repo_dir
+                unless (tries -= 1).zero?
+                  @log.info("Re-trying last command becuase of error: #{e.message}, retries left: #{tries}")
+                  sleep(1)
+                  retry
+                end
+                # TODO: not used now
+                error_backtrace = backtrace_subset(e)
                 raise e
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.7.4.1
+  version: 0.7.5
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.