Skip to content

Commit 016096e

Browse files
committed
rename function for finding classifier settings
Prior to this commit, the full path that r10k needed to untar was more than 100 characters for the classifier settings function After this commit, it should be just short of 100 characters so it works around PUP-5994 before we can get the resolution in puppetlabs/forge-ruby#27
1 parent 6957aa6 commit 016096e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Puppet::Parser::Functions
2-
newfunction(:puppet_master_classifer_settings, :type => :rvalue) do |args|
2+
newfunction(:master_classifer_settings, :type => :rvalue) do |args|
33
function_parseyaml([function_file([File.join(lookupvar('settings::confdir').to_s, 'classifier.yaml')])])
44
end
55
end

manifests/code_manager.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
$code_manager_service_user_password = fqdn_rand_string(40, '', "${code_manager_service_user}_password")
1717
$create_role_creates_file = "${token_directory}/deploy_environments_created"
1818

19-
#puppet_master_classifier_settings is a custom function
20-
$classifier_settings = puppet_master_classifer_settings()
19+
#master_classifier_settings is a custom function
20+
$classifier_settings = master_classifer_settings()
2121
$classifier_hostname = $classifier_settings['server']
2222
$classifier_port = $classifier_settings['port']
2323

0 commit comments

Comments
 (0)