Project

General

Profile

« Previous | Next » 

Revision 08a172b9

Added by Dominic Cleal about 8 years ago

Swap hiera_config default values for Puppet 3.x and 4.x

`$codedir` should only be used on Puppet 4, and the Puppet 3 default
should be using `$confdir`. This failed on Puppet 3 tests with:

/Puppet::Server::Config/Exec[puppet_server_config-generate_ca_cert]/returns:
    Error converting value for param 'hiera_config': Could not find value for $codedir

View differences:

manifests/params.pp
$server_puppetserver_dir = '/etc/puppetserver'
$server_ruby_load_paths = []
$server_jruby_gem_home = '/var/lib/puppet/jruby-gems'
$hiera_config = '$codedir/hiera.yaml'
$hiera_config = '$confdir/hiera.yaml'
} else {
$configtimeout = undef
$server_puppetserver_dir = '/etc/puppetlabs/puppetserver'
$server_ruby_load_paths = ['/opt/puppetlabs/puppet/lib/ruby/vendor_ruby']
$server_jruby_gem_home = '/opt/puppetlabs/server/data/puppetserver/jruby-gems'
$hiera_config = '$confdir/hiera.yaml'
$hiera_config = '$codedir/hiera.yaml'
}
$usecacheonfailure = true
$ca_server = undef

Also available in: Unified diff