From 124b1a2727466e63cf82858bb09749454dae40d3 Mon Sep 17 00:00:00 2001
From: Nate McCurdy <nate.mccurdy@puppet.com>
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.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'scripts/config_version.rb')

diff --git a/scripts/config_version.rb b/scripts/config_version.rb
index 3016a27..5aade34 100755
--- a/scripts/config_version.rb
+++ b/scripts/config_version.rb
@@ -1,24 +1,24 @@
 #!/usr/bin/env ruby
 begin
   require 'rugged'
+  require 'socket'
 rescue LoadError => e
   t = Time.new
   puts t.to_i
 else
-
   environmentpath = ARGV[0]
   environment     = ARGV[1]
 
-  repo = Rugged::Repository.discover(File.join(environmentpath, environment))
-  head  = repo.head
-
-  #sha1 hash of the newest commit
-  head_sha = head.target_id
+  # Get the hostname of the Puppet master compiling the catalog.
+  compiling_master = Socket.gethostname
 
-  #the commit message associated the newest commit
-  commit = repo.lookup(head_sha)
+  # Get the path to the environment being compiled.
+  repo = Rugged::Repository.discover(File.join(environmentpath, environment))
+  head = repo.head
 
-  #add something to find the remote url
+  # First 12 characters of the sha1 hash of the newest commit.
+  commit_id = head.target_id[0...11]
 
-  puts head_sha 
+  # Show the compiling master, environment name, and commit ID.
+  puts "#{compiling_master}-#{environment}-#{commit_id}"
 end
-- 
cgit v1.2.3