dtk-node-agent 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGU1YzU1MGExMTNiOWE2YmY5YjI0YmY0ZjVhODZkZDM2MGI0OTM3Nw==
-  data.tar.gz: !binary |-
-    NTIxY2IwNmIyYzI4OTgxNGI2OGU0NzFmMmM5MjQ1MGI2OTE1ZDBjMw==
+SHA1:
+  metadata.gz: b8335fb0f4233d412e417fdba18b362bbcabfebd
+  data.tar.gz: 68abdc2d3619c4b093ff57ea2b0313966ed28960
 SHA512:
-  metadata.gz: !binary |-
-    Y2JlZDAzNGEyMjgzZmM4ZDMwYWJlOTZlNzIxNGIxNDkwZGNiYzhjMWFhMjhm
-    ODA2YmM0MTIxY2U5ODViM2NiOGRkYTVhZmEwMDg3ZWNjNWRjYjM0NGM5ODA5
-    NjgxYWVjMGFkNjllODU5NzU4ZWJkYTlkZGYwY2NjYjI5MWYyYTQ=
-  data.tar.gz: !binary |-
-    MmUxNGYyNzNjZTkwZTJiODA4ZTM2MmJlOGU3YTg1YTM4NTE0NGI5NGNhMzgz
-    ODExMTQ4NzkzMGMzNTlmYWYzYjNjYzA0MGRjODRjZWY0NDMzZTFiODY4MTkz
-    MjUxOWVkY2ZlM2I1ZGMyOTAwZTQ2OTczN2FkOGQwMGE3Yjc5NmQ=
+  metadata.gz: d62b7826af4cae0fc60a15f43a4fb80465a84861c8fe015b96a499c1d70cff16d65ba9ad2ad5deb8216f06a219367abbcf1c00b7ea9a44273310182618a8a1d8
+  data.tar.gz: 1bc30fe59c25323819456a757e1070e23886c4079f33ddb92e305b185e25fc4b37b08fda3c83fad45979d0ec14d023cfb830576c92c61e611cd58947730c27ed

data/README.md

@@ -44,6 +44,12 @@ packer build template.json
 ```  
 This will also copy images to all AWS regions.  
 
+To get json output of new images, first, add .fog file on your home directory (with valid aws credentials) and then run following ruby script:
+```
+ruby get_amis.rb <AMI_TIMESTAMPS>
+```
+AMI_TIMESTAMPS can be one timestamp or array of timestamps separated with delimiter (,)
+
 License
 ----------------------
 DTK Node Agent is released under the GPLv3 license. Please see LICENSE for more details.

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.7.0"
+  VERSION="0.7.1"
 end

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

@@ -30,7 +30,7 @@ module DTK
         end
       end
 
-    private        
+    private
       def git_command__remote_add(remote_repo,branch,remote_name=nil)
         remote_name ||= default_remote()
         git_command().remote(git_command_opts(),"add","-t", branch, "-f", remote_name, remote_repo)

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

@@ -8,8 +8,9 @@ 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"
+ModulePath                  = "/etc/puppet/modules"
 DTKPuppetCacheBaseDir       = "/usr/share/dtk/tasks"
+DTKPuppetModulePath         = "/usr/share/dtk/puppet-modules"
 
 module MCollective
   module Agent
@@ -62,15 +63,21 @@ module MCollective
                 raise "version context does not have :#{field} field"
               end
             end
-            repo_dir = "#{ModulePath}/#{vc[:implementation]}"
-            remote_repo = "#{git_server}:#{vc[:repo]}"
+
+            FileUtils.mkdir_p(DTKPuppetModulePath) unless File.directory?(DTKPuppetModulePath)
+
+            module_name     = vc[:implementation]
+            puppet_repo_dir = "#{DTKPuppetModulePath}/#{module_name}"
+            repo_dir        = "#{ModulePath}/#{module_name}"
+            remote_repo     = "#{git_server}:#{vc[:repo]}"
+
             opts = Hash.new
             opts.merge!(:sha => vc[:sha]) if vc[:sha]
 
             clean_and_clone = true
-            if File.exists?("#{repo_dir}/.git")
+            if File.exists?("#{puppet_repo_dir}/.git")
               pull_err = trap_and_return_error do
-                pull_module(repo_dir,vc[:branch],opts)
+                pull_module(puppet_repo_dir, vc[:branch], opts)
               end
               # clean_and_clone set so if pull error then try again, this time cleaning dir and freshly cleaning
               clean_and_clone = !pull_err.nil?
@@ -78,15 +85,30 @@ module MCollective
 
             if clean_and_clone
               begin
-                clean_and_clone_module(repo_dir,remote_repo,vc[:branch],opts)
+                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 repo_dir
+                FileUtils.rm_rf puppet_repo_dir
                 raise e
               end
             end
+
+            # remove symlink if exist already
+            if File.symlink?(repo_dir)
+              FileUtils.rm(repo_dir)
+            elsif File.directory?(repo_dir)
+              FileUtils.rm_r(repo_dir)
+            end
+
+            puppet_dir = "#{DTKPuppetModulePath}/#{module_name}/puppet"
+
+            if File.directory?(puppet_dir)
+              FileUtils.ln_sf(puppet_dir, repo_dir)
+            else
+              FileUtils.ln_sf("#{DTKPuppetModulePath}/#{module_name}", repo_dir)
+            end
           end
           ret.set_status_succeeded!()
          rescue Exception => e

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

@@ -79,7 +79,11 @@ module MCollective
       end
 
       def key_added?(system_user, pub_key)
-        results = `more /home/#{system_user}/.ssh/#{SSH_AUTH_KEYS_FILE_NAME} | grep #{pub_key}`
+        if system_user == "root"
+          results = `more /#{system_user}/.ssh/#{SSH_AUTH_KEYS_FILE_NAME} | grep #{pub_key}`
+        else
+          results = `more /home/#{system_user}/.ssh/#{SSH_AUTH_KEYS_FILE_NAME} | grep #{pub_key}`
+        end
         !results.empty?
       end
 

data/mcollective_additions/plugins/v2.2/util/puppetrunner.rb

@@ -5,8 +5,13 @@ module MCollective
     class PuppetRunner
 
       def self.apply(puppet_definition, resource_hash)
-        Puppet.settings.initialize_global_settings
-        Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(Puppet.run_mode))
+        if Puppet.settings.respond_to?(:initialize_global_settings)
+          Puppet.settings.initialize_global_settings
+        end
+
+        if Puppet.settings.respond_to?(:initialize_app_defaults)
+          Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(Puppet.run_mode))
+        end
 
         Log.info("Puppet Runner, INPUT :")
         Log.info(puppet_definition)

data/src/etc/mcollective.default

@@ -0,0 +1,6 @@
+# MCollective defaults used by the init script
+export LC_ALL="en_US.UTF-8"
+
+# Unset Rubygems related environment variables set by RVM
+unset GEM_HOME
+unset GEM_PATH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -28,84 +28,84 @@ dependencies:
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !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
@@ -126,14 +126,14 @@ dependencies:
   name: dtk-action-agent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The DTK Node Agent runs on your nodes that you wish to manage using your
@@ -249,6 +249,7 @@ files:
 - src/etc/init.d/logstash-forwarder.rpm.init
 - src/etc/logrotate.d/mcollective
 - src/etc/logrotate.d/puppet
+- src/etc/mcollective.default
 homepage: https://github.com/rich-reactor8/dtk-node-agent
 licenses:
 - GPL-3.0
@@ -259,17 +260,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.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.