diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2017-03-27 13:21:42 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-03-27 13:21:42 +0300 |
| commit | b306ab891f8710dc99069e3c2116ddc2c885c90c (patch) | |
| tree | 26263aaeb8d84e4e50a30a2a479dacf2bb9c97f5 /include/tests_tooling | |
| parent | 8d5243c928cd8774cde4412d028cca7e3ae0bae6 (diff) | |
Add additional check for Puppet tool
Diffstat (limited to 'include/tests_tooling')
| -rw-r--r-- | include/tests_tooling | 12 |
1 files changed, 11 insertions, 1 deletions
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 |