dtk-node-agent 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db191267189513117e4624e6fbac5b7e51fcbb3
-  data.tar.gz: d2ba3f2281f425abb2b0586471df8220fb3fdf4c
+  metadata.gz: 9b50a68f952a5501d9689ff70e03c7afae5beaf5
+  data.tar.gz: 0407e13ddcc0cde2632e783190ddd113d1538ec5
 SHA512:
-  metadata.gz: 5346d1c4d7a668cae356dba258abc9ac2738d3f9106623d164752c1ef1a65604bd3bc2eb3b3f6aa1c27fce68c7c5fcde7ccb9af22c9f52e730ad443889cfa28c
-  data.tar.gz: 7c943b0420db1bd9f4a4a3f11f6eec46fe9d4713bdd22dca977e34e3dcc4919eec5e07d8ac638e01f35382b2504507dc2740dbd100b4a34789362044673c0419
+  metadata.gz: be6caee6a90bc73496dc39c33416950f2e06ee6bde44c97312fbdf735279eade767d797bcbe018d08e639df8e9f2a875727952ac6b81e24275f16d89d676385b
+  data.tar.gz: b8784f3b22a332ab6a36ac7a5c3e8f70a4d0993ae2bac91a3e727ec71d5573b3758f97b6294bcaf8ec464f2b1e35da0745278b9a95975890d9de58825b7ace2c

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

@@ -67,6 +67,8 @@ module DTK
               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"
+              # do a full upgrade
+              shell "yum -y update"
               case @osmajrelease
               when "5"
                 shell "rpm -ivh #{CONFIG[:puppetlabs_el5_rpm_repo]}"
@@ -164,27 +166,39 @@ module DTK
             # create puppet group
             shell "groupadd puppet" unless `grep puppet /etc/group`.include? "puppet"
             # create necessary dirs
-            [   '/var/log/puppet/',
+            [ '/var/log/puppet/',
               '/var/lib/puppet/lib/puppet/indirector',
-              '/etc/puppet/modules'
+              '/etc/puppet/modules',
+              '/usr/share/dtk/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 dtk/r8 puppet module
+            FileUtils.cp_r(Dir.glob("#{base_dir}/puppet_additions/modules/*"), "/usr/share/dtk/modules/")
+            # symlink dtk/r8 puppet module
+            FileUtils.ln_sf("/usr/share/dtk/modules/dtk", "/etc/puppet/modules/")
+            FileUtils.ln_sf("/usr/share/dtk/modules/r8", "/etc/puppet/modules/")
           end
 
           def self.base_dir
             File.expand_path('../..', File.dirname(__FILE__))
           end
 
+          def self.is_systemd
+            File.exist?("/etc/systemd/system")
+          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'
+              # in case of a systemd system, reload the daemons
+              if is_systemd
+                shell "systemctl daemon-reload"
+                shell "systemctl enable #{script}.service"
+              end
             end
           end
 
@@ -194,11 +208,13 @@ module DTK
             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
             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")            
+            FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter") if File.exist?(monit_cfg_path)          
           end
     end
   end

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

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

data/puppet_additions/modules/dtk/lib/puppet/provider/dtk_export_variable/default.rb

@@ -0,0 +1,27 @@
+require 'fileutils'
+
+Puppet::Type.type(:dtk_export_variable).provide(:default) do
+  desc "dtk export variable"
+
+  def create
+    name = resource[:name]
+    content = resource[:content]
+    if name =~ /(^.+)::(.+$)/
+      component = $1
+      attribute = $2
+      if content = (content == '***' ? scope.lookupvar(name) : content)
+        p = Thread.current[:exported_variables] ||= Hash.new
+        (p[component] ||= Hash.new)[attribute] = content
+        File.open('/tmp/dtk_exported_variables', 'w') { |f| f.write(Marshal.dump(p)) }
+      end
+    end
+  end
+
+  def destroy
+    FileUtils.rm_rf("/tmp/dtk_exported_variables")
+  end
+
+  def exists?
+    
+  end
+end

data/puppet_additions/modules/dtk/lib/puppet/type/dtk_export_file.rb

@@ -0,0 +1,54 @@
+#
+# Simple module for logging messages on the client-side
+#
+
+module Puppet
+  newtype(:dtk_export_file) do
+    @doc = "dtk export file content"
+
+    newparam(:name) do
+      desc "component and attribute name in dot notation"
+    end
+
+    newparam(:filename) do
+      desc "file name"
+    end
+
+    newparam(:definition_key) do
+      desc "Value of name field used when there is a definition"
+    end
+
+    newproperty(:ensure) do
+      desc "Whether the resource is in sync or not."
+
+      defaultto :insync
+
+      def retrieve
+        :outofsync
+      end
+
+      newvalue :insync do
+        filename = resource[:filename]
+        unless File.exists?(filename)
+          raise Puppet::Error, "File #{resource[:filename]} does not exist"
+        end
+        Puppet.send(@resource[:loglevel], "exporting #{filename} for #{resource[:name]}")
+        if resource[:name] =~ /(^.+)\.(.+$)/
+          cmp_name = $1
+          attr_name = $2
+
+          cmp_ref = cmp_name.gsub(/[.]/,"::")
+          if def_key =  resource[:definition_key]
+            cmp_ref = "#{cmp_ref}[#{def_key}]"
+          end
+          p = (Thread.current[:exported_files] ||= Hash.new)[cmp_ref] ||= Hash.new
+          p[attr_name] = filename
+          File.open('/tmp/dtk_exported_files', 'w') { |f| f.write(Marshal.dump(p)) }
+        else
+          raise Puppet::Error, "ill-formed component with name (#{resource[:name]})"
+        end
+        return
+      end
+    end
+  end
+end

data/puppet_additions/modules/dtk/lib/puppet/type/dtk_export_variable.rb

@@ -0,0 +1,19 @@
+Puppet::Type.newtype(:dtk_export_variable) do
+  @doc = "dtk export variable content"
+
+  ensurable
+
+  newparam(:name) do
+    desc "component and attribute name in dot notation"
+
+    validate do |value|
+      unless value =~ /.*::.*/
+        raise ArgumentError, "name attribute: #{value} is in invalid format, should be in <component>::<attribute> format"
+      end
+    end
+  end
+
+  newparam(:content) do
+    desc "variable content to store in specific attribute"
+  end
+end

data/puppet_additions/modules/dtk/manifests/export_variable.pp

@@ -0,0 +1,9 @@
+define dtk::export_variable(
+  $content = undef,
+) {
+  dtk_export_variable { $name:
+    name => $name,
+    content => $content,
+    ensure => present,
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -182,6 +182,10 @@ files:
 - lib/config/install.config
 - lib/dtk-node-agent/installer.rb
 - lib/dtk-node-agent/version.rb
+- puppet_additions/modules/dtk/lib/puppet/provider/dtk_export_variable/default.rb
+- puppet_additions/modules/dtk/lib/puppet/type/dtk_export_file.rb
+- puppet_additions/modules/dtk/lib/puppet/type/dtk_export_variable.rb
+- puppet_additions/modules/dtk/manifests/export_variable.pp
 - puppet_additions/modules/r8/lib/puppet/provider/r8_export_variable/default.rb
 - puppet_additions/modules/r8/lib/puppet/type/r8_export_file.rb
 - puppet_additions/modules/r8/lib/puppet/type/r8_export_variable.rb