dtk-node-agent 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDA2NGNlZDk5MmRkNDA0MDAxNGE2NDA0ZWQ3OGU2YTNjZjk1MTM1NA==
-  data.tar.gz: !binary |-
-    ZmEzMGY2M2MxZWEzNmJmNjVhMGFhMDM0NTkyMjIxNjhlMThlYTQ1ZA==
+SHA1:
+  metadata.gz: 2c4258ca5cb60403937721b99ec018fbc18289e8
+  data.tar.gz: 12029e8a5da62543709508ca3ab3a0bad90711c2
 SHA512:
-  metadata.gz: !binary |-
-    OWMyYThiN2Q1NzMzN2YxMzI0YzAwNGJjZTA1MDExYmIxOGU3OTA1YTliYjZj
-    ZjUzMWQzMDQ5NTA0MGE2MzYzZmEyNTk5ZmRiNzg0YmM0MTBkNTFkNDQxNzUy
-    YTZkYzZlMjhhZThkODE2OTQwZDBjYzQyMDUzOGNkMzljZTc3Zjc=
-  data.tar.gz: !binary |-
-    OTJlZjM2OWY5ZjNhNzIyODMwMTdlMmIwMjgzODBiMjJkNGNlODFkM2RmNzFj
-    M2IxMzFiYmQ1ZmJhODgwZDVhMWVmZDBlOWUwMDdmOTRhMWE2MjliZDRhZjk4
-    NzhkMDAyNDVkYTNkYjRjNzAyOWZkNDhlYThjMDYyYjZiYWVhMDk=
+  metadata.gz: 4fcf05069560e9995661d80808fad36ee659bbb9197d84cfc2de947cda864380bd6cd3458a5e08132bd2094da9a4e1fda4250d655d483790f1326fee1bb1a58e
+  data.tar.gz: 908822b562a073403269b707434d624cbed21414282ee59ef79d8248eccd832320b873cfa48d9bf6efd95b464e94c374544953135dc7b1ecb17801c25b9edc05

data/dtk-node-agent.gemspec

@@ -28,13 +28,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = DtkNodeAgent::PROD_VERSION || "#{DtkNodeAgent::VERSION}.#{ARGV[3]}".chomp(".")
 
-  gem.add_dependency 'puppet', '~> 3.3.2'
-  gem.add_dependency 'facter', '~> 1.7.3'
+  gem.add_dependency 'puppet', '3.6.2'
+  gem.add_dependency 'facter', '~> 2.2.0'
   gem.add_dependency 'grit', '~> 2.5.0'
   gem.add_dependency 'stomp', '~> 1.3.1'
   gem.add_dependency 'sshkeyauth', '~> 0.0.11'
   gem.add_dependency 'serverspec', '~> 1.1.0'
   gem.add_dependency 'specinfra', '~> 1.0.4'
   gem.add_dependency 'posix-spawn', '0.3.8'
+  gem.add_dependency 'ruby-debug', '~> 0.10.4'
 
 end

data/lib/config/install.config

@@ -1,8 +1,9 @@
 {
 	:puppet_version            => '3.3.0',
-	:mcollective_version       => 2.2,
-	:puppetlabs_el5_rpm_repo   => 'http://yum.puppetlabs.com/el/5/products/i386/puppetlabs-release-5-7.noarch.rpm',
-	:puppetlabs_el6_rpm_repo   => 'http://yum.puppetlabs.com/el/6/products/i386/puppetlabs-release-6-7.noarch.rpm',
+  :mcollective_version       => 2.2,
+	:puppetlabs_el5_rpm_repo   => 'http://yum.puppetlabs.com/puppetlabs-release-el-5.noarch.rpm',
+  :puppetlabs_el6_rpm_repo   => 'http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm',
+	:puppetlabs_el7_rpm_repo   => 'http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm',
 	:rpm_forge_el5_X86_64_repo => 'http://apt.sw.be/redhat/el5/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el5.rf.x86_64.rpm',
 	:rpm_forge_el5_i686_repo   => 'http://apt.sw.be/redhat/el5/en/i386/rpmforge/RPMS/rpmforge-release-0.5.3-1.el5.rf.i386.rpm',
 	:rpm_forge_el6_X86_64_repo => 'http://apt.sw.be/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm',
@@ -10,7 +11,7 @@
 	:puppet_omnibus_deb64      => 'http://dtk-storage.s3.amazonaws.com/puppet-omnibus_2.7.23-fpm0_amd64.deb',
 	:puppet_omnibus_rpm64      => 'http://dtk-storage.s3.amazonaws.com/puppet-omnibus-2.7.23.fpm0-1.x86_64.rpm',
   :upgrades => {
-    :redhat => ['openssl', 'bash'],
-    :debian => ['openssl', 'bash']
+    :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced'],
+    :debian => ['openssl', 'bash', 'emacs23-nox', 'vim']
   }
 }

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

@@ -1,13 +1,20 @@
 module DTK
   module NodeAgent
     class Installer
+      require 'facter'
 
       # read configuration
       CONFIG = eval(File.open(File.expand_path('../config/install.config', File.dirname(__FILE__))) {|f| f.read })
 
+      # set OS facts
+      @osfamily     = Facter.value('osfamily').downcase
+      @osname       = Facter.value('operatingsystem')
+      @osmajrelease = Facter.value('operatingsystemmajrelease')
+      @osarch       = Facter.value('architecture')
+      @distcodename = Facter.value('lsbdistcodename')
+
       def self.run(argv)
         require 'optparse'
-        require 'facter'
         require 'fileutils'
         require 'dtk-node-agent/version'
 
@@ -18,7 +25,7 @@ module DTK
           exit(1)
         end
 
-        if Facter.osfamily == 'Debian'
+        if @osfamily == 'debian'
               # set up apt and install packages
               shell "apt-get update --fix-missing"
               shell "apt-get install -y build-essential wget curl git"
@@ -26,43 +33,43 @@ module DTK
               Array(CONFIG[:upgrades][:debian]).each do |package|
                 shell "apt-get install -y #{package}"
               end
-              shell "wget http://apt.puppetlabs.com/puppetlabs-release-#{Facter.lsbdistcodename}.deb"
+              shell "wget http://apt.puppetlabs.com/puppetlabs-release-#{@distcodename}.deb"
               puts "Installing Puppet Labs repository..."
-              shell "dpkg -i puppetlabs-release-#{Facter.lsbdistcodename}.deb"
+              shell "dpkg -i puppetlabs-release-#{@distcodename}.deb"
               shell "apt-get update"
-              shell "rm puppetlabs-release-#{Facter.lsbdistcodename}.deb"
+              shell "rm puppetlabs-release-#{@distcodename}.deb"
               # install mcollective
               puts "Installing MCollective..."
               shell "apt-get -y install mcollective"
-            elsif Facter.osfamily == 'RedHat'
+            elsif @osfamily == 'redhat'
               shell "yum -y install yum-utils wget bind-utils"
               # install upgrades
               Array(CONFIG[:upgrades][:redhat]).each do |package|
                 shell "yum -y update #{package}"
               end
-              case Facter.operatingsystemmajrelease
+              case @osmajrelease
               when "5"
                 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]}")
+                @osarch == '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"
                 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]}")
+                @osarch == '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"
                 shell "yum-config-manager --enable rpmforge-extras"
+              when "7"
+                shell "rpm -ivh #{CONFIG[:puppetlabs_el7_rpm_repo]}"
               else
-                puts "#{Facter.operatingsystem} #{Facter.operatingsystemmajrelease} is not supported. Exiting now..."
+                puts "#{@osname} #{@osmajrelease} is not supported. Exiting now..."
                 exit(1)
               end
               puts "Installing MCollective..."
               shell "yum -y install mcollective"
-              shell "chkconfig mcollective on"
               shell "yum -y install git"
               # install ec2-run-user-data init script
               # 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"
+                set_init("ec2-run-user-data")
               end
             else
               puts "Unsuported OS for automatic agent installation. Exiting now..."
@@ -137,20 +144,31 @@ module DTK
             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/")        
-            FileUtils.cp_r(Dir.glob("#{base_dir}/mcollective_additions/plugins/v#{CONFIG[:mcollective_version]}/*"), "/usr/share/mcollective/plugins/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("#{base_dir}/mcollective_additions/server.cfg", "/etc/mcollective", :remove_destination => true)
-
+            FileUtils.cp_r("#{mco_add_dir}/server.cfg", "/etc/mcollective", :remove_destination => true)
             # copy compatible mcollective init script
-            FileUtils.cp_r("#{base_dir}/mcollective_additions/#{Facter.osfamily.downcase}.mcollective.init", "/etc/init.d/mcollective", :remove_destination => true)
-            shell "chmod +x /etc/init.d/mcollective"
+            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
             File.expand_path('../..', File.dirname(__FILE__))
           end
 
+          def self.set_init(script)
+            shell "chmod +x /etc/init.d/#{script}"
+            if @osfamily == 'debian'
+              shell "update-rc.d #{script} defaults"
+            elsif @osfamily == 'redhat'
+              shell "chkconfig --level 345 #{script} on"
+              shell "systemctl daemon-reload" if @osmajrelease == '7'
+            end
+          end
+
     end
   end
 end

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

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

data/mcollective_additions/redhat.mcollective.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=The Marionette Collective
+After=network.target
+
+[Service]
+Type=forking
+StandardOutput=syslog
+StandardError=syslog
+ExecStart=/usr/sbin/mcollectived --config=/etc/mcollective/server.cfg --pidfile=/var/run/mcollective.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+PIDFile=/var/run/mcollective.pid
+
+[Install]
+WantedBy=multi-user.target

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-13 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
+        version: 3.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 3.6.2
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        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
@@ -122,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 description: The DTK Node Agent runs on your nodes that you wish to manage using your
   DTK Server.  It comes pre-installed on all nodes created/managed by hosted DTK Server
   accounts.
@@ -190,6 +204,7 @@ files:
 - mcollective_additions/plugins/v2.2/security/sshkey.rb
 - mcollective_additions/plugins/v2.2/util/puppetrunner.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
@@ -209,17 +224,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.