View Options

	diff --git a/manifests/puppet/base.pp b/manifests/puppet/base.pp
	index eb8b3bc..84515af 100644
	--- a/manifests/puppet/base.pp
	+++ b/manifests/puppet/base.pp
	@@ -1,55 +1,69 @@
	# Base puppet configuration for all hosts.

	class profile::puppet::base {
	$puppetmaster = lookup('puppet::master::hostname')

	$agent_config = {
	runmode => 'none',
	pluginsync => true,
	puppetmaster => $puppetmaster,
	additional_settings => {
	environment_data_provider => 'hiera',
	},
	}

	file { '/usr/local/sbin/swh-puppet-test':
	ensure => 'file',
	owner => 'root',
	group => 'root',
	mode => '0755',
	content => template('profile/puppet/swh-puppet-test.sh.erb'),
	}

	file { '/usr/local/sbin/swh-puppet-apply':
	ensure => 'file',
	owner => 'root',
	group => 'root',
	mode => '0755',
	content => template('profile/puppet/swh-puppet-apply.sh.erb'),
	}

	# Backported packages
	if $::lsbdistcodename == 'jessie' {
	$pinned_packages = [
	'facter',
	'hiera',
	'puppet',
	'puppet-common',
	'puppetmaster',
	'puppetmaster-common',
	'puppetmaster-passenger',
	'ruby-deep-merge',
	]
	+ }
	+ elsif $::lsbdistcodename == 'stretch' {
	+ $pinned_packages = [
	+ 'facter',
	+ 'libfacter*',
	+ 'libleatherman*',
	+ 'libleatherman-data',
	+ 'libcpp-hocon*',
	+ ]
	+ }
	+ else {
	+ $pinned_packages = undef
	+ }

	+ if $pinned_packages {
	::apt::pin {'puppet':
	explanation => 'Pin puppet dependencies to backports',
	- codename => 'jessie-backports',
	+ codename => "${::lsbdistcodename}-backports",
	packages => $pinned_packages,
	priority => 990,
	}
	} else {
	::apt::pin {'puppet':
	ensure => 'absent',
	}
	}
	}

File Metadata