dtk-node-agent 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad68634a5e68d066f8f701e46f4d3ca862f2155a
-  data.tar.gz: 91a504fc63ee94ad4f632e16e2b13401a514d567
+  metadata.gz: 83a631d87679f1239f93f30dfea26b9e5b18fcd3
+  data.tar.gz: 6b44d346158a6b587f577366ab75193c95725514
 SHA512:
-  metadata.gz: a817bed6644222c78c619f202037cd9122ac28fde07ffaeb42a53f96386a324331b9e53140840c72f15b11cab1407184db72016ec9bb2185ca9d6ee095071f63
-  data.tar.gz: a2c5ddc22197bf531d5d73a9cb6f07b676ce8029730c0f79e4915b6c5aae9152ddcc32a64643f4a3ef2f4954dc3ce9613eae0274bef4e5f4c8a88858d67fd5ce
+  metadata.gz: 7a77b99e94ea2cb6a6c10e96177bd335f477568e00a7588db5ca569ff8dedc2bdafd759f70b73e04cf09a0a6fb0c9bdf1935e30f8cb526a8cca4df9056f36a20
+  data.tar.gz: d8c2c1824bbcadc9ed22631ee635d398c04027eade5897b2ac1fbd46ac02cdade3d4cb5215255a7897cab9a8c82e311c0fcec93aeca388eed7acbf704f5cbc89

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

@@ -48,20 +48,20 @@ module DTK
           shell "apt-get install -y build-essential wget curl git libicu-dev zlib1g-dev"
           # install upgrades
 
-          # don't install utility packages inside docker to save 
+          # don't install utility packages inside docker to save space
           unless inside_docker?
             Array(CONFIG[:upgrades][:debian]).each do |package|
               shell "apt-get install -y #{package}"
             end
             # install logstash forwarder
-            logstash_forwarder_url = CONFIG[:logstash_forwarder_deb64]
-            logstash_forwarder_package = logstash_forwarder_url.rpartition('/').last
-            shell "wget #{logstash_forwarder_url}"
-            puts "Installing logstash-forwarder"
-            shell "dpkg -i #{logstash_forwarder_package}"
-            shell "rm #{logstash_forwarder_package}"
+            # logstash_forwarder_url = CONFIG[:logstash_forwarder_deb64]
+            # logstash_forwarder_package = logstash_forwarder_url.rpartition('/').last
+            # shell "wget #{logstash_forwarder_url}"
+            # puts "Installing logstash-forwarder"
+            # shell "dpkg -i #{logstash_forwarder_package}"
+            # shell "rm #{logstash_forwarder_package}"
           end
-          shell "wget http://apt.puppetlabs.com/puppetlabs-release-#{@distcodename}.deb"
+          shell "wget -q http://apt.puppetlabs.com/puppetlabs-release-#{@distcodename}.deb"
           puts "Installing Puppet Labs repository..."
           shell "dpkg -i puppetlabs-release-#{@distcodename}.deb"
           puts "Installing Puppet Labs repository..."
@@ -120,8 +120,13 @@ module DTK
         puts "Installing DTK Arbiter"
         install_arbiter unless @@options[:no_arbiter_install]
 
-        puts "Disabling apt-daily service"
-        disable_apt_daily if @lsbdistcodename == 'xenial'
+        if @distcodename == 'xenial'
+          # TO-DO apt-daily.service is set as static after disabling
+          puts "Disabling apt-daily service"
+          disable_apt_daily
+          # override service timer
+          override_apt_daily_timer
+        end
       end
 
       private
@@ -196,20 +201,22 @@ module DTK
         File.expand_path('../..', File.dirname(__FILE__))
       end
 
-      def self.is_systemd
-        File.exist?("/etc/systemd/system")
+      def self.is_systemd?
+        system("pidof systemd > /dev/null")
       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"
+        if is_systemd?
           # in case of a systemd system, reload the daemons
-          if is_systemd
-            shell "systemctl daemon-reload"
-            shell "systemctl enable #{script}.service"
+          shell "systemctl daemon-reload"
+          puts "Enabling systemd #{script}.service"
+          shell "systemctl enable #{script}.service"
+        else
+          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"
           end
         end
       end
@@ -220,9 +227,12 @@ module DTK
         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")
-        # copy the service file, since systemd doesn't follow symlinks
-        FileUtils.cp("/usr/share/dtk/dtk-arbiter/etc/systemd.dtk-arbiter.service", "/etc/systemd/system/dtk-arbiter.service") if is_systemd
+        if is_systemd?
+          # copy the service file, since systemd doesn't follow symlinks
+          FileUtils.cp("/usr/share/dtk/dtk-arbiter/etc/systemd.dtk-arbiter.service", "/etc/systemd/system/dtk-arbiter.service")
+        else
+          FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/#{@osfamily}.dtk-arbiter.init", "/etc/init.d/dtk-arbiter")
+        end
         set_init("dtk-arbiter")
         puts "Installing dtk-arbiter monit config."
         monit_cfg_path = (@osfamily == 'debian') ? "/etc/monit/conf.d" : "/etc/monit.d"
@@ -236,6 +246,12 @@ module DTK
         shell "systemctl disable apt-daily.service"
       end
 
+      def self.override_apt_daily_timer
+        timer_dir = '/etc/systemd/system/apt-daily.timer.d/'
+        FileUtils.mkdir_p(timer_dir)
+        FileUtils.cp("#{base_dir}/src/etc/systemd/override.conf", timer_dir)
+      end
+
       def self.inside_docker?
         File.exist?('/.dockerenv')
       end

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

@@ -16,5 +16,5 @@
 # limitations under the License.
 #
 module DtkNodeAgent
-  VERSION="0.11.2"
+  VERSION="0.11.3"
 end

data/src/etc/systemd/override.conf

@@ -0,0 +1,6 @@
+# apt-daily timer configuration override
+[Timer]
+OnBootSec=15min
+OnUnitActiveSec=1d
+AccuracySec=1h
+RandomizedDelaySec=30min

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -197,6 +197,7 @@ files:
 - src/etc/init.d/ec2-run-user-data
 - src/etc/init.d/logstash-forwarder.rpm.init
 - src/etc/logrotate.d/puppet
+- src/etc/systemd/override.conf
 homepage: https://github.com/rich-reactor8/dtk-node-agent
 licenses:
 - Apache-2.0
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: DTK Node Agent gem.