From 124b1a2727466e63cf82858bb09749454dae40d3 Mon Sep 17 00:00:00 2001 From: Nate McCurdy Date: Wed, 5 Jul 2017 16:55:39 -0700 Subject: config_version: Show the compiling master's name Prior to this, the config_version script just showed the commit ID of the version of code being compiled. This commit includes the compiling Puppet master's hostname and environment name in the config_version. This is very useful for debugging when a Puppet master is failing and you have multiple masters behind a load balancer. The output of config_version now looks like this: pupmaster01-production-ac9785273a10 --- scripts/config_version.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/config_version.sh') diff --git a/scripts/config_version.sh b/scripts/config_version.sh index bc77213..8dd8086 100755 --- a/scripts/config_version.sh +++ b/scripts/config_version.sh @@ -3,10 +3,10 @@ if [ -e $1/$2/.r10k-deploy.json ] then /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2 elif [ -e /opt/puppetlabs/server/pe_version ] -then - /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 +then + /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 else /usr/bin/git --version > /dev/null 2>&1 && /usr/bin/git --git-dir $1/$2/.git rev-parse HEAD || date +%s -fi +fi -- cgit v1.2.3