Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(SUP-4277) Update bash helper functions to support V2 #162

Merged
merged 1 commit into from May 30, 2023
Merged

(SUP-4277) Update bash helper functions to support V2 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions tasks/st0236_set_cache_paths_to_default.sh
View file
Open in desktop
Expand Up @@ -5,13 +5,13 @@ source "$PT__installdir/bash_task_helper/files/task_helper.sh"

if [ -n "$(facter -p pe_build)" ]
then
success '{ "status": "success - Not an agent node" }'
task-suceed "success - Not an agent node"
fi

manifest=""
vardir=$(puppet config print vardir) || fail "unable to determine vardir "
statedir=$(puppet config print statedir) || fail "unable to determine statedir "
rundir=$(puppet config print rundir) || fail "unable to determine rundir "
vardir=$(puppet config print vardir) || task-fail "unable to determine vardir"
statedir=$(puppet config print statedir) || task-fail "unable to determine statedir"
rundir=$(puppet config print rundir) || task-fail "unable to determine rundir"

if [ "$vardir" != "/opt/puppetlabs/puppet/cache" ]
then
Expand All @@ -31,9 +31,9 @@ fi

if [ "$manifest" != "" ]
then
puppet apply -e "$manifest" || fail "unable to reset parameters "
success '{ "status": "success - parameters reset to default" }'
puppet apply -e "$manifest" || task-fail "unable to reset parameters"
task-succeed "success - parameters reset to default"
else
success '{ "status": "success - No changes necessary" }'
task-succeed "success - No changes necessary"
fi

12 changes: 6 additions & 6 deletions tasks/st0267_clear_file_sync_locks.sh
View file
Open in desktop
Expand Up @@ -6,17 +6,17 @@ source "$PT__installdir/bash_task_helper/files/task_helper.sh"

if [ -z "$(facter -p pe_build)" ]
then
success '{ "status": "success - Agent Node Not Proceeding" }'
task-succeed "success - Agent Node Not Proceeding"
fi

if [ -e "/etc/sysconfig/pe-puppetserver" ] || [ -e "/etc/default/pe-puppetserver" ] # Test to confirm this is a Puppetserver
then

puppet resource service pe-puppetserver ensure=stopped || fail "Could not stop pe-puppetserver "
$(/usr/bin/which find) /opt/puppetlabs/server/data/puppetserver/filesync/ -type f -name 'index.lock' -delete -print || fail "Could not remove lockfile"
puppet resource service pe-puppetserver ensure=running || fail "Could not start pe-puppetserver "
puppet resource service pe-puppetserver ensure=stopped || task-fail "Could not stop pe-puppetserver"
$(/usr/bin/which find) /opt/puppetlabs/server/data/puppetserver/filesync/ -type f -name 'index.lock' -delete -print || task-fail "Could not remove lockfile"
puppet resource service pe-puppetserver ensure=running || task-fail "Could not start pe-puppetserver"
else
success '{ "status": "success - pe-puppetserver not installed" }'
task-succeed "success - pe-puppetserver not installed"
fi

success '{ "status": "success - filesync lock removed or not present" }'
task-succeed "success - filesync lock removed or not present"
6 changes: 3 additions & 3 deletions tasks/st0287_check_db_table_sizes.sh
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ elif puppet resource service postgresql-* | grep -q running; then
dbname="puppetdb"
fi
else
success '{ "status": "success - Node not running pe-postgresql or postgresql service, please select node which is." }'
task-succeed "success - Node not running pe-postgresql or postgresql service, please select node which is."
fi

#Run for the correct environment
Expand All @@ -53,7 +53,7 @@ fi
getdbTables "psql" "${dbname}" "${postgresservice}" "puppetdb"
;;
*)
fail "Cannot Determine if Puppet Enterprise or Puppet Open Source"
task-fail "Cannot Determine if Puppet Enterprise or Puppet Open Source"
esac

success '{ "status": "success - Task completed" }'
task-succeed "success - Task completed"
10 changes: 5 additions & 5 deletions tasks/st0298_run_code_deploy.sh
View file
Open in desktop
Expand Up @@ -11,15 +11,15 @@ then
then
if [ "$environment" != 'all' ]
then
/opt/puppetlabs/bin/puppet-code deploy "$environment" --wait -l debug 2>&1 || fail "code deploy failed "
/opt/puppetlabs/bin/puppet-code deploy "$environment" --wait -l debug 2>&1 || task-fail "code deploy failed"
else
/opt/puppetlabs/bin/puppet-code deploy --all --wait -l debug 2>&1 || fail "code deploy failed "
/opt/puppetlabs/bin/puppet-code deploy --all --wait -l debug 2>&1 || task-fail "code deploy failed"
fi
else
fail "Token not available in default location /root/.puppetlabs/token: https://puppet.com/docs/pe/latest/rbac_token_auth_intro.html#generate-a-token-using-puppet-access "
task-fail "Token not available in default location /root/.puppetlabs/token: https://puppet.com/docs/pe/latest/rbac_token_auth_intro.html#generate-a-token-using-puppet-access"
fi
else
fail "Node is not a Primary or does not have Code Manager configured. To enable Code Manager please follow the documentation here: https://puppet.com/docs/pe/latest/code_mgr_config.html "
task-fail "Node is not a Primary or does not have Code Manager configured. To enable Code Manager please follow the documentation here: https://puppet.com/docs/pe/latest/code_mgr_config.html"
fi

success '{ "status": "success - Code Deploy completed" }'
task-succeed "success - Code Deploy completed"
8 changes: 4 additions & 4 deletions tasks/st0346a_bash_herd_resolver.sh
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ source "$PT__installdir/bash_task_helper/files/task_helper.sh"
# This task is to be run on operating systems using a bash shell
# It will randomise the restart of the puppet agent based on the current value of runinterval

sleep $(( ( RANDOM % $(/opt/puppetlabs/bin/puppet agent --configprint runinterval) ) + 1 ))s || fail "unable to set random sleep interval "
/opt/puppetlabs/bin/puppet resource service puppet ensure=stopped || fail "unable stop puppet service "
/opt/puppetlabs/bin/puppet resource service puppet ensure=running || fail "unable start puppet service "
sleep $(( ( RANDOM % $(/opt/puppetlabs/bin/puppet agent --configprint runinterval) ) + 1 ))s || task-fail "unable to set random sleep interval"
/opt/puppetlabs/bin/puppet resource service puppet ensure=stopped || task-fail "unable stop puppet service"
/opt/puppetlabs/bin/puppet resource service puppet ensure=running || task-fail "unable start puppet service"

success '{ "status": "success - Agent restarted at random interval" }'
task-succeed "success - Agent restarted at random interval"
7 changes: 4 additions & 3 deletions tasks/st1096_db_commands.sh
View file
Open in desktop
@@ -1,12 +1,13 @@
#!/bin/bash

declare PT__installdir
source "$PT__installdir/support_tasks/files/common.sh"
source "$PT__installdir/bash_task_helper/files/task_helper.sh"

PUPPET_BIN='/opt/puppetlabs/puppet/bin'
psql_options=("-d" "$database")

"$PUPPET_BIN/puppet" resource service pe-postgresql | grep -q running || {
fail 'pe-postgresql service not found'
task-fail "pe-postgresql service not found"
}

case "${command?}" in
Expand Down Expand Up @@ -47,7 +48,7 @@ esac
# For better readability, return stdout to the caller instead of trying to munge psql output to json
chmod +r "$_installdir"
runuser -u pe-postgres -- /opt/puppetlabs/server/bin/psql "${psql_options[@]}" || {
fail "Error running query"
task-fail "Error running query"
}

[[ -e $tmp_query ]] && rm -- "$tmp_query"
Expand Down