set default values for different puppet versions

[sartiran]

This PR goes with quattor/configuration-modules-core#1201 the components and schema have been updated to be compliant with the most recent versions of puppet. I've just introduced a default.pan template managing the different default values corresponding to different versions.

[jrha]

This might be neater:

variable PUPPET_VERSION ?= '3.0.0';

'/software/components/puppet' = {
    version = PUPPET_VERSION;
    version = replace('^([0-9]+)$', '$1.0', version); #Pad single to double
    version = replace('^([0-9]+\.[0-9]+)$', '$1.0', version); # Pad double to triple
…etc…

[jrha]

In fact this shouldn't be necessary if you are only using if for the comparisons later on, pkg_compare_version should handle this for you.

[jrha]

pkg_repl() is preferred.

'/software/packages' = pkg_repl('puppet');

[jrha]

Try to avoid operating on SELF like this. It might actually be nicer to adapt this to instead include a defaults file for each major version, but it's up to you.

Perhaps something like:

include if (pkg_compare_version(PUPPET_VERSION, '4.0.0') != PKG_VERSION_LESS) 'features/puppet/defaults_4+';
include if (pkg_compare_version(PUPPET_VERSION, '5.0.0') != PKG_VERSION_LESS) 'features/puppet/defaults_5+';

template features/puppet/defaults_4+;

include 'components/puppet/config';

prefix '/software/components/puppet';
'hieraconf_file' = '/etc/puppetlabs/code/environments/production/hiera.yaml';
'puppet_cmd' = '/opt/puppetlabs/bin/puppet';
'puppetconf_file' = '/etc/puppetlabs/puppet/puppet.conf';

template features/puppet/defaults_5+;

include 'components/puppet/config';

prefix '/software/components/puppet';

'nodefiles/{quattor_default.pp}/contents' = "lookup('classes', Array[String], 'unique').include",

'modulepath' = '/etc/puppetlabs/code/environments/production/modules';

'nodefiles_path' = '/etc/puppetlabs/code/environments/production/manifests';

"hieraconf" = dict(
    "version", 5,
    "hierarchy", list(
        dict(
            "name", "quattor",
            "path", "quattor.yaml",
        )
    ),
    "defaults", dict(
        "datadir", "/etc/puppetlabs/code/environments/production/data",
        "data_hash", "yaml_data",
    ),
);

'hieradata_file' = '/etc/puppetlabs/code/environments/production/data/quattor.yaml';

[sartiran]

Hi James, I've tried to implement all your recommendations. Actually I cannot define to a standard value PUPPET_VERSION in the defaults template as it seems that this template is called one first time before the site's defaults are set (and fixing the variable would imply that the sites cannot have a define+fallback setup). Changing this would require touching a lot of other stuff and I'd prefer not to. Thus I've implemented this in a slightly different way wrt what you suggested.

[jrha]

Would it be acceptable to provide a default Puppet version to avoid having to check for it being defined?

For example:

variable PUPPET_VERSION ?= '3.0.0';

[jrha]

Ok I see your comment, nevermind.

[jrha]

LGTM, I presume you've tested this!

[sartiran]

Sorry, I had to add a modification. It seems that pkg_compare_version does not handle comparing versions which are not in the X.Y.Z format. So I've re-introduced the PUPPET_VERSION formatting in the default template.

[jrha]

Ok, my apologies, my testing seemed to indicate that it worked!