diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/code_manager_config_version.rb | 3 | ||||
| -rwxr-xr-x | scripts/config_version.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/code_manager_config_version.rb b/scripts/code_manager_config_version.rb index 1ef62af..beacabc 100755 --- a/scripts/code_manager_config_version.rb +++ b/scripts/code_manager_config_version.rb @@ -6,7 +6,8 @@ environmentpath = ARGV[0] environment = ARGV[1] # 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. r10k_deploy_file_path = File.join(environmentpath, environment, '.r10k-deploy.json') diff --git a/scripts/config_version.rb b/scripts/config_version.rb index 9ccd8d5..3de7104 100755 --- a/scripts/config_version.rb +++ b/scripts/config_version.rb @@ -10,7 +10,8 @@ else environment = ARGV[1] # 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. repo = Rugged::Repository.discover(File.join(environmentpath, environment)) |