dtk-node-agent 0.7.7 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2RlMGM1NDc2OTAzNzRiOWUzZjNjZjFkYmE1NTU4OTJmNTFkZTUzYg==
-  data.tar.gz: !binary |-
-    OTA4Mzg4MjVhOGYxYTlkZmI2MWIxZDViOTA4MDM5NjZlOGFmM2FmZQ==
+SHA1:
+  metadata.gz: 1b2558dc921a52afa04207be07867a87c74d52cc
+  data.tar.gz: 1d05260af4d0371810b9555558c3437212e2b11c
 SHA512:
-  metadata.gz: !binary |-
-    YTcyYmUzN2ZiYmQ0OWQ2ZDEzNGVjZGVmZDJjNDgwYTM1ODliYTY5MTA0MGE5
-    YzhlYTRkM2E3Y2I3OWY0YzQ2OWQxYmIyY2EwZGJlYzRhZGMwN2FjYzNlYmQz
-    YWQ4OTllYmQ1ZDc2ZGZkNGUyNWEzYWFjNTQxZmQ0ZjUxYTdhZTM=
-  data.tar.gz: !binary |-
-    ZDBjNzQzMDBlMjI2NGE5NjlmNGVjZGYyZWRhMzgyNjU5NWUwMTc1MzQyNTZm
-    MmY1MmJmY2NlMDk3N2NlMGVlYWQ4ODE4ZDE4MDliYmFlNzJjZTIyM2NjYTU1
-    NmQ2YzVhNGQ3Y2M4NjAwYTUwNzNmMDBiMTMwZDk1Njc3NTUxYWU=
+  metadata.gz: 22a98c8a7dc3b6451a261f18c321b9a6b0489d05210564cbf40c8dada85b3fcb58b87e5ff4ceb37977f880687f84b9a73812bd437b9e79d65ee9c0e41aba981c
+  data.tar.gz: 7cd3f3a9d29a5499ed0b86688e2328db9495285f5190aa4867aca08fc701a328d3cad24c99681d65135ef9ec1cbb8c7f7554d5f94e36e89318420c497ea41703

data/README.md

@@ -1,7 +1,12 @@
 dtk-node-agent
 ==============
 
-Code that is present in AMIs that server basis for nodes being spun up
+What it is?
+--------------
+Set of scripts that are present in AMIs that serves as basis for nodes that are spun up via DTK. Below is manual usage of these scripts (if you want to install Puppet Omnibus on nodes, burn new AMIs that will be used by DTK) but that step is not necessary for everyday usage of DTK
+
+Manual usage
+--------------
 
 ### Build the gem:
 `gem build dtk-node-agent.gemspec`
@@ -27,8 +32,20 @@ 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.
+## License
+
+dtk-node-agent is copyright (C) 2010-2016 dtk contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this work except in compliance with the License.
+You may obtain a copy of the License in the [LICENSE](LICENSE) file, or at:
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 

data/bin/dtk-node-agent

@@ -1,4 +1,21 @@
 #!/usr/bin/env ruby
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 # Bundler and rubygems maintain a set of directories from which to
 # load gems. If Bundler is loaded, let it determine what can be

data/lib/config/install.config

@@ -13,7 +13,7 @@
   :logstash_forwarder_rpm64  => 'http://dtk-storage.s3.amazonaws.com/logstash-forwarder-0.3.1-1.x86_64.rpm',
   :logstash_forwarder_deb64  => 'http://dtk-storage.s3.amazonaws.com/logstash-forwarder_0.3.1_amd64.deb',
   :upgrades => {
-    :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced'],
-    :debian => ['openssl', 'bash', 'emacs23-nox', 'vim']
+    :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced', 'monit'],
+    :debian => ['openssl', 'bash', 'emacs23-nox', 'vim', 'monit']
   }
 }

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

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK
   module NodeAgent
     class Installer
@@ -46,18 +63,10 @@ module DTK
               shell "dpkg -i #{logstash_forwarder_package}"
               shell "apt-get update"
               shell "rm puppetlabs-release-#{@distcodename}.deb #{logstash_forwarder_package}"
-              # install mcollective
-              puts "Installing MCollective..."
-              shell "apt-get -y install mcollective"
               # pin down the puppetlabs apt repo
               FileUtils.cp("#{base_dir}/src/etc/apt/preferences.d/puppetlabs", "/etc/apt/preferences.d/puppetlabs")
             elsif @osfamily == 'redhat'
               shell "yum -y install yum-utils wget curl"
-              # install upgrades
-              Array(CONFIG[:upgrades][:redhat]).each do |package|
-                shell "yum -y install #{package}"
-                shell "yum -y update #{package}"
-              end
               case @osmajrelease
               when "5"
                 shell "rpm -ivh #{CONFIG[:puppetlabs_el5_rpm_repo]}"
@@ -74,9 +83,12 @@ module DTK
                 puts "#{@osname} #{@osmajrelease} is not supported. Exiting now..."
                 exit(1)
               end
-              puts "Installing MCollective..."
-              shell "yum -y install mcollective"
               shell "yum -y install git"
+              # install upgrades
+              Array(CONFIG[:upgrades][:redhat]).each do |package|
+                shell "yum -y install #{package}"
+                shell "yum -y update #{package}"
+              end
               # install ec2-run-user-data init script
               # but only if the machine is running on AWS
               if `curl -m 5 -sI http://169.254.169.254/latest/meta-data/`.include? '200 OK'
@@ -93,7 +105,7 @@ module DTK
               exit(1)
             end
 
-            puts "Installing additions for MCollective and Puppet..."
+            puts "Installing additions Puppet..."
             install_additions
 
             puts "Installing DTK Arbiter"
@@ -154,24 +166,12 @@ module DTK
             # create necessary dirs
             [   '/var/log/puppet/',
               '/var/lib/puppet/lib/puppet/indirector',
-              '/etc/puppet/modules',
-              '/usr/share/mcollective/plugins/mcollective'
+              '/etc/puppet/modules'
               ].map! { |p| FileUtils.mkdir_p(p) unless File.directory?(p) }
             # copy puppet libs
             FileUtils.cp_r(Dir.glob("#{base_dir}/puppet_additions/puppet_lib_base/puppet/indirector/*"), "/var/lib/puppet/lib/puppet/indirector/")
             # copy r8 puppet module
             FileUtils.cp_r(Dir.glob("#{base_dir}/puppet_additions/modules/r8"), "/etc/puppet/modules")
-            # copy mcollective plugins
-            FileUtils.cp_r(Dir.glob("/usr/libexec/mcollective/mcollective/*"), "/usr/share/mcollective/plugins/mcollective") if File.directory?("/usr/libexec/mcollective/")        
-            mco_add_dir = "#{base_dir}/mcollective_additions"
-            mco_plugin_dir = "#{mco_add_dir}/plugins/v#{CONFIG[:mcollective_version]}"
-            FileUtils.cp_r(Dir.glob("#{mco_plugin_dir}/*"), "/usr/share/mcollective/plugins/mcollective")
-            # copy mcollective config
-            FileUtils.cp_r("#{mco_add_dir}/server.cfg", "/etc/mcollective", :remove_destination => true)
-            # copy compatible mcollective init script
-            FileUtils.cp_r("#{mco_add_dir}/#{@osfamily}.mcollective.init", "/etc/init.d/mcollective", :remove_destination => true)
-            FileUtils.cp_r("#{mco_add_dir}/#{@osfamily}.mcollective.service", "/usr/lib/systemd/system/mcollective.service", :remove_destination => true) if File.exist?("/usr/lib/systemd/system/mcollective.service")
-            set_init("mcollective")
           end
 
           def self.base_dir
@@ -192,9 +192,14 @@ module DTK
             shell "git clone -b stable https://github.com/dtk/dtk-arbiter /usr/share/dtk/dtk-arbiter"
             Dir.chdir "/usr/share/dtk/dtk-arbiter"
             shell "bundle install --without development"
+            puts "Installing dtk-arbiter init script"
             FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/#{@osfamily}.dtk-arbiter.init", "/etc/init.d/dtk-arbiter")
             set_init("dtk-arbiter")
+            puts "Installing dtk-arbiter monit config."
+            monit_cfg_path = (@osfamily == 'debian') ? "/etc/monit/conf.d" : "/etc/monit.d"
+            set_init("monit")
+            FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter")            
           end
     end
   end
-end
+end

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

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DtkNodeAgent
-  VERSION="0.7.7"
+  VERSION="0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -28,98 +28,98 @@ 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: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.2
 - !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
@@ -140,28 +140,28 @@ 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'
 - !ruby/object:Gem::Dependency
   name: bundler
   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
@@ -182,91 +182,6 @@ files:
 - lib/config/install.config
 - lib/dtk-node-agent/installer.rb
 - lib/dtk-node-agent/version.rb
-- mcollective_additions/debian.mcollective.init
-- mcollective_additions/plugins/README.md
-- mcollective_additions/plugins/v1.2/agent/discovery.rb
-- mcollective_additions/plugins/v1.2/agent/get_log_fragment.ddl
-- mcollective_additions/plugins/v1.2/agent/get_log_fragment.rb
-- mcollective_additions/plugins/v1.2/agent/git_access.ddl
-- mcollective_additions/plugins/v1.2/agent/git_access.rb
-- mcollective_additions/plugins/v1.2/agent/netstat.ddl
-- mcollective_additions/plugins/v1.2/agent/netstat.rb
-- mcollective_additions/plugins/v1.2/agent/puppet_apply.ddl
-- mcollective_additions/plugins/v1.2/agent/puppet_apply.rb
-- mcollective_additions/plugins/v1.2/agent/rpcutil.ddl
-- mcollective_additions/plugins/v1.2/agent/rpcutil.rb
-- mcollective_additions/plugins/v1.2/facts/pbuilder_facts.rb
-- mcollective_additions/plugins/v2.2/agent/action_agent.ddl
-- mcollective_additions/plugins/v2.2/agent/action_agent.rb
-- mcollective_additions/plugins/v2.2/agent/dev_manager.ddl
-- mcollective_additions/plugins/v2.2/agent/dev_manager.rb
-- mcollective_additions/plugins/v2.2/agent/discovery.rb
-- 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
-- mcollective_additions/plugins/v2.2/agent/git_access.rb
-- mcollective_additions/plugins/v2.2/agent/netstat.ddl
-- mcollective_additions/plugins/v2.2/agent/netstat.rb
-- mcollective_additions/plugins/v2.2/agent/ps.ddl
-- mcollective_additions/plugins/v2.2/agent/ps.rb
-- mcollective_additions/plugins/v2.2/agent/puppet_apply.ddl
-- mcollective_additions/plugins/v2.2/agent/puppet_apply.rb
-- mcollective_additions/plugins/v2.2/agent/puppet_cancel.ddl
-- mcollective_additions/plugins/v2.2/agent/puppet_cancel.rb
-- mcollective_additions/plugins/v2.2/agent/rpcutil.ddl
-- mcollective_additions/plugins/v2.2/agent/rpcutil.rb
-- mcollective_additions/plugins/v2.2/agent/ssh_agent.ddl
-- mcollective_additions/plugins/v2.2/agent/ssh_agent.rb
-- mcollective_additions/plugins/v2.2/agent/sync_agent_code.ddl
-- mcollective_additions/plugins/v2.2/agent/sync_agent_code.rb
-- mcollective_additions/plugins/v2.2/agent/tail.ddl
-- mcollective_additions/plugins/v2.2/agent/tail.rb
-- mcollective_additions/plugins/v2.2/audit/logfile.rb
-- mcollective_additions/plugins/v2.2/connector/r8stomp.rb
-- mcollective_additions/plugins/v2.2/connector/stomp.rb
-- mcollective_additions/plugins/v2.2/connector/stomp_em.rb
-- mcollective_additions/plugins/v2.2/data/agent_data.ddl
-- mcollective_additions/plugins/v2.2/data/agent_data.rb
-- mcollective_additions/plugins/v2.2/data/collective_data.ddl
-- mcollective_additions/plugins/v2.2/data/collective_data.rb
-- mcollective_additions/plugins/v2.2/data/fact_data.ddl
-- mcollective_additions/plugins/v2.2/data/fact_data.rb
-- mcollective_additions/plugins/v2.2/data/fstat_data.ddl
-- mcollective_additions/plugins/v2.2/data/fstat_data.rb
-- mcollective_additions/plugins/v2.2/discovery/flatfile.ddl
-- mcollective_additions/plugins/v2.2/discovery/flatfile.rb
-- mcollective_additions/plugins/v2.2/discovery/mc.ddl
-- mcollective_additions/plugins/v2.2/discovery/mc.rb
-- mcollective_additions/plugins/v2.2/discovery/stdin.ddl
-- mcollective_additions/plugins/v2.2/discovery/stdin.rb
-- mcollective_additions/plugins/v2.2/facts/pbuilder_facts.rb
-- mcollective_additions/plugins/v2.2/facts/yaml_facts.rb
-- mcollective_additions/plugins/v2.2/registration/agentlist.rb
-- mcollective_additions/plugins/v2.2/security/sshkey.ddl
-- mcollective_additions/plugins/v2.2/security/sshkey.rb
-- mcollective_additions/plugins/v2.2/util/puppetrunner.rb
-- mcollective_additions/plugins/v2.2/validator/array_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/array_validator.rb
-- mcollective_additions/plugins/v2.2/validator/ipv4address_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/ipv4address_validator.rb
-- mcollective_additions/plugins/v2.2/validator/ipv6address_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/ipv6address_validator.rb
-- mcollective_additions/plugins/v2.2/validator/length_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/length_validator.rb
-- mcollective_additions/plugins/v2.2/validator/regex_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/regex_validator.rb
-- mcollective_additions/plugins/v2.2/validator/shellsafe_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/shellsafe_validator.rb
-- mcollective_additions/plugins/v2.2/validator/typecheck_validator.ddl
-- mcollective_additions/plugins/v2.2/validator/typecheck_validator.rb
-- mcollective_additions/redhat.mcollective.init
-- mcollective_additions/redhat.mcollective.service
-- 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
@@ -275,9 +190,7 @@ files:
 - src/etc/apt/preferences.d/puppetlabs
 - src/etc/init.d/ec2-run-user-data
 - 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
@@ -288,17 +201,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.8
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.