dtk-node-agent 0.5.16 → 0.5.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThkYzFjNTQ4ZDY3MTFiNTc1NjdlNzEyMGRiYzk3MzBkN2Y1ZmU0Yg==
+    YTNhMGI2MjY5NjExZmMyNmIwZjFiYWYwNzFjMWY5ZTgzOTJhNDY1Nw==
   data.tar.gz: !binary |-
-    Zjk3MTc1NTAxZDAxMThmYzYzNjAwMzczYmI0ZWIwOWIxYjFmY2ZjYg==
+    M2E5ZTVhZjM2MjE1M2JhYTA1YjVjMzhjNjdiOTZjNzQzNjI2NDg4ZA==
 SHA512:
   metadata.gz: !binary |-
-    YzU5NzAyNjc1ZDFkNmIzZWM4OTUxYWZkMjNjNDA0OGFjYzZhNDM5MzViODAz
-    YWI0OGU3NDA2NTUxM2U0MmNmNTk4NGQ1ZDYyYjU5MWFhNDJkMDA0OTVmNGY5
-    Mzk2YTIzYmVmOWYwMDgwZGM0ZDc2NWNmODY2MjU2NTE2NGEzM2M=
+    YmY2MWMyZTEyNmQ3ZmIxYzE5MzQyMTFhN2JhYmI4NWRlMmVjYjFjZWE3OTE5
+    ODg5NGZjYWQ3YjBjZTNkYjFhNmNlMWQ0YzAwZGRmMjRiMjU5YjZlYzliZGE5
+    YWE2M2U3OWJkOGEwYmJkZTJmOWVlNGIzOTIyZDRhM2E4ZDcwZjQ=
   data.tar.gz: !binary |-
-    YzJhYTZiNjlmY2E5ODMwMjczNDU2NTM1N2MyYzRmYzAxM2I0MjRhYmU1Zjcw
-    OGVhMWQyMmM5YmZjNTkyNTZiZTZkNmQwOTA4OWEyYWIwYjRhM2MwZTJmOTgw
-    MGY3OTZmYjc2NGY1NDAxODg2MmM5NjY4ZDRlNjYxMGMyNDAxNGI=
+    ODI0ZGY0YjEwYWJlYjkxMGY3YjM5MmQ5MTU3YWYxOTNlMjIyZDFlMjQ4YTdh
+    NmEzYjVlNTczZmY2ZjdiNjZhYjEzMTg0NGRmMzFhN2EwOGJiYzYyMmQyNzZi
+    MzMzZjk4NDA3OTYxYTgzZGExOWExNTdlYzNiZmQ2ZTliNTllZWQ=

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

@@ -133,6 +133,9 @@ module DTK
 
         # copy mcollective config
         FileUtils.cp_r("#{base_dir}/mcollective_additions/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)
       end
 
       def self.base_dir

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

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.5.16"
+  VERSION="0.5.17"
 end

data/mcollective_additions/debian.mcollective.init

@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# mcollective   Application Server for STOMP based agents
+#
+#
+# description:  mcollective lets you build powerful Stomp compatible middleware clients in ruby without having to worry too
+#               much about all the setup and management of a Stomp connection, it also provides stats, logging and so forth
+#               as a bonus.
+#
+### BEGIN INIT INFO
+# Provides:          mcollective
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by mcollective.
+### END INIT INFO
+
+# check permissions
+
+uid=`id -u`
+[ $uid -gt 0 ] && { echo "You need to be root to run file" ; exit 4 ; }
+
+
+# PID directory
+pidfile="/var/run/mcollectived.pid"
+
+name="mcollective"
+mcollectived=/usr/sbin/mcollectived
+daemonopts="--pid=${pidfile}  --config=/etc/mcollective/server.cfg"
+
+
+# Source function library.
+. /lib/lsb/init-functions
+
+# Check that binary exists
+if ! [ -f $mcollectived ]
+then
+    echo "mcollectived binary not found"
+    exit 5
+fi
+
+# create pid file if it does not exist
+[ ! -f ${pidfile} ] && { touch ${pidfile} ; }
+
+# See how we were called.
+case "$1" in
+    start)
+        echo "Starting daemon: " $name
+        # start the program
+        start-stop-daemon -S -p ${pidfile} --oknodo -q -a ${mcollectived} -- ${daemonopts}
+        [ $? = 0 ] && { exit 0 ; } || { exit 1 ; }
+        log_success_msg "mcollective started"
+        touch $lock
+        ;;
+    stop)
+        echo "Stopping daemon: " $name
+        start-stop-daemon -K -R 5 -s "TERM" --oknodo -q -p ${pidfile}
+        [ $? = 0 ] && { exit 0 ; } || { exit 1 ; }
+        log_success_msg "mcollective stopped"
+        ;;
+    restart)
+        echo "Restarting daemon: " $name
+        $0 stop
+        sleep 2
+        $0 start
+        [ $? = 0 ] && { echo "mcollective restarted" ; exit 0 ; }
+        ;;
+    condrestart)
+        if [ -f $lock ]; then
+            $0 stop
+            # avoid race
+            sleep 2
+            $0 start
+        fi
+        ;;
+    status)
+        status_of_proc -p ${pidfile} ${mcollectived} ${name} && exit 0 || exit $?
+        ;;
+    *)
+        echo "Usage: mcollectived {start|stop|restart|condrestart|status}"
+        exit 2
+        ;;
+esac

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

@@ -64,19 +64,26 @@ module MCollective
             remote_repo = "#{git_server}:#{vc[:repo]}"
             opts = Hash.new
             opts.merge!(:sha => vc[:sha]) if vc[:sha]
-            begin
-              if File.exists?(repo_dir)
-                git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir)
-                git_repo.pull_and_checkout_branch?(vc[:branch],opts)
-              else
-                git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir,:create=>true)
-                git_repo.clone_branch(remote_repo,vc[:branch],opts)
+
+            clean_and_clone = true
+            if File.exists?("#{repo_dir}/.git")
+              pull_err = trap_and_return_error do
+                pull_module(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?
+            end
+
+            if clean_and_clone
+              begin
+                clean_and_clone_module(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
+                raise e
               end
-             rescue Exception => e
-              error_backtrace = backtrace_subset(e)
-              #to achieve idempotent behavior; fully remove directory if any problems
-              FileUtils.rm_rf repo_dir
-              raise e
             end
           end
           ret.set_status_succeeded!()
@@ -92,6 +99,28 @@ module MCollective
         ret 
       end
 
+      # returns a trapped error
+      def trap_and_return_error(&body)
+        error = nil
+        begin
+          yield
+         rescue => e
+          error = e
+        end
+        error
+      end
+
+      def pull_module(repo_dir,branch,opts={})
+        git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir)
+        git_repo.pull_and_checkout_branch?(branch,opts)
+      end
+
+      def clean_and_clone_module(repo_dir,remote_repo,branch,opts={})
+        FileUtils.rm_rf repo_dir if File.exists?(repo_dir)
+        git_repo = ::DTK::NodeAgent::GitClient.new(repo_dir,:create=>true)
+        git_repo.clone_branch(remote_repo,branch,opts)
+      end
+
       def run(request)
         cmps_with_attrs = request[:components_with_attributes]
         node_manifest = request[:node_manifest]

data/mcollective_additions/redhat.mcollective.init

@@ -0,0 +1,139 @@
+#!/bin/sh
+#
+# mcollective   Application Server for STOMP based agents
+#
+# chkconfig:    - 24 76
+#
+# description:  mcollective lets you build powerful Stomp compatible middleware clients in ruby without having to worry too
+#               much about all the setup and management of a Stomp connection, it also provides stats, logging and so forth
+#               as a bonus.
+#
+### BEGIN INIT INFO
+# Provides:          mcollective
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+mcollectived="/usr/sbin/mcollectived"
+pidfile="/var/run/mcollectived.pid"
+if [ -d /var/lock/subsys ]; then
+    # RedHat/CentOS/etc who use subsys
+    lockfile="/var/lock/subsys/mcollective"
+else
+    # The rest of them
+    lockfile="/var/lock/mcollective"
+fi
+
+# Check that binary exists
+if ! [ -f $mcollectived ]; then
+    echo "mcollectived binary not found"
+    exit 5
+fi
+
+# Source function library.
+. /etc/init.d/functions
+
+if [ -f /etc/sysconfig/mcollective ]; then
+    . /etc/sysconfig/mcollective
+fi
+
+# Determine if we can use the -p option to daemon, killproc, and status.
+# RHEL < 5 can't.
+if status | grep -q -- '-p' 2>/dev/null; then
+    daemonopts="--pidfile $pidfile"
+    pidopts="-p $pidfile"
+fi
+
+start() {
+    echo -n "Starting mcollective: "
+    # Only try to start if not already started
+    if ! rh_status_q; then
+      daemon ${daemonopts} ${mcollectived} --pid=${pidfile} --config="/etc/mcollective/server.cfg"
+    fi
+    # This will be 0 if mcollective is already running
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${lockfile}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Shutting down mcollective: "
+    # If running, try to stop it
+    if rh_status_q; then
+      killproc ${pidopts} -d 10 ${mcollectived}
+    else
+      # Non-zero status either means lockfile and pidfile need cleanup (1 and 2)
+      # or the process is already stopped (3), so we can just call true to
+      # trigger the cleanup that happens below.
+      true
+    fi
+    RETVAL=$?
+    echo
+    [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+    return $RETVAL
+}
+
+restart() {
+    stop
+    start
+}
+
+reload_agents() {
+    echo -n "Reloading mcollective agents: "
+    killproc ${pidopts} ${mcollectived} -USR1
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+reload_loglevel() {
+    echo -n "Cycling mcollective logging level: "
+    killproc ${pidopts} ${mcollectived} -USR2
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+rh_status() {
+    status ${pidopts} ${mcollectived}
+    RETVAL=$?
+    return $RETVAL
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+# See how we were called.
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        restart
+        ;;
+    condrestart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    reload-agents)
+        reload_agents
+        ;;
+    reload-loglevel)
+        reload_loglevel
+        ;;
+    status)
+        rh_status
+        ;;
+    *)
+        echo "Usage: mcollectived {start|stop|restart|condrestart|reload-agents|reload-loglevel|status}"
+        RETVAL=2
+        ;;
+esac
+exit $RETVAL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -126,6 +126,7 @@ 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
@@ -174,6 +175,7 @@ files:
 - 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/redhat.mcollective.init
 - mcollective_additions/server.cfg
 - puppet_additions/modules/r8/lib/puppet/type/r8_export_file.rb
 - puppet_additions/modules/r8/manifests/export_variable.rb