devsnack/control-repo
1
0
Fork 0
Code Releases Activity

Show the short hostname, not the FQDN in config_version

Browse Source 
This is mainly a style and readability change.

Prior to this, on masters whose hostname is actually their FQDN, the
config_version script would show the entire FQDN. On nodes with really
longs FQDN's, it was not very nice to look at.

This takes the hostname of the master, splits it on dots (.) and takes
the first segment.

Now this: compile-master-02.int.lab.dmz.company-name.net-production-48fd18ab
Is this:  compile-master-02-production-48fd18ab
This commit is contained in:
Nate McCurdy 2017-12-15 12:52:14 -06:00
parent 09df4b4961
commit e5189b5515
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/code_manager_config_version.rb
View File

@ -6,7 +6,8 @@ environmentpath = ARGV[0]
environment = ARGV[1] environment = ARGV[1]
# Get the hostname of the Puppet master compiling the catalog. # Get the hostname of the Puppet master compiling the catalog.
compiling_master = Socket.gethostname # Sometimes the hostname is the fqdn, so we'll take the first segment.
compiling_master = Socket.gethostname.split('.').first
# Get the path to the Code Manager deployment info file. # Get the path to the Code Manager deployment info file.
r10k_deploy_file_path = File.join(environmentpath, environment, '.r10k-deploy.json') r10k_deploy_file_path = File.join(environmentpath, environment, '.r10k-deploy.json')

3
scripts/config_version.rb
View File

@ -10,7 +10,8 @@ else
environment = ARGV[1] environment = ARGV[1]
# Get the hostname of the Puppet master compiling the catalog. # Get the hostname of the Puppet master compiling the catalog.
compiling_master = Socket.gethostname # Sometimes the hostname is the fqdn, so we'll take the first segment.
compiling_master = Socket.gethostname.split('.').first
# Get the path to the environment being compiled. # Get the path to the environment being compiled.
repo = Rugged::Repository.discover(File.join(environmentpath, environment)) repo = Rugged::Repository.discover(File.join(environmentpath, environment))