From b306ab891f8710dc99069e3c2116ddc2c885c90c Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 27 Mar 2017 12:21:42 +0200
Subject: [PATCH] Add additional check for Puppet tool

---
 include/tests_tooling | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/tests_tooling b/include/tests_tooling
index e26a23aa..348e0306 100644
--- a/include/tests_tooling
+++ b/include/tests_tooling
@@ -101,15 +101,25 @@
         done
 
         # Puppet
-        if [ ! "${PUPPETBINARY}" = "" ]; then
+
+        # Check for Puppet installation provided by Puppetlabs package
+        if [ -z "${PUPPETBINARY}" ]; then
+            if [ -f ${ROOTDIR}opt/puppetlabs/puppet/bin/puppet ]; then
+                PUPPETBINARY="${ROOTDIR}opt/puppetlabs/puppet/bin/puppet"
+            fi
+        fi
+
+        if [ ! -z "${PUPPETBINARY}" ]; then
             LogText "Result: Puppet is installed (${PUPPETBINARY})"
             AUTOMATION_TOOL_FOUND=1
             Report "automation_tool_running[]=puppet-agent"
             Display --indent 4 --text "Found: Puppet (agent)" --result "${STATUS_FOUND}" --color GREEN
         fi
+
         IsRunning "puppet master"
         if [ ${RUNNING} -eq 1 ]; then
             LogText "Result: found puppet master"
+            AUTOMATION_TOOL_FOUND=1
             PUPPET_MASTER_RUNNING=1
             Report "automation_tool_running[]=puppet-master"
             Display --indent 4 --text "Found: Puppet (master)" --result "${STATUS_FOUND}" --color GREEN