Project

General

Profile

« Previous | Next » 

Revision 7601a886

Added by Mathieu Parent almost 8 years ago

Don't deploy site.pp on Puppet >= 4.0 (#412)

As https://projects.puppetlabs.com/issues/15106 was fixed in Puppet 3.3:
  • Don't deploy site.pp anymore
  • Bump puppet minimum version to 3.3
  • Drop now unused $server_manifest_path completely

View differences:

manifests/init.pp
# $server_envs_dir:: Directory that holds puppet environments
# type:string
#
# $server_manifest_path:: Path to puppet site.pp manifest (only when
# $server_git_repo_path and $server_dynamic_environments
# are false)
# type:string
#
# $server_common_modules_path:: Common modules paths (only when
# $server_git_repo_path and $server_dynamic_environments
# are false)
......
$server_environments_group = $puppet::params::server_environments_group,
$server_environments_mode = $puppet::params::server_environments_mode,
$server_envs_dir = $puppet::params::server_envs_dir,
$server_manifest_path = $puppet::params::server_manifest_path,
$server_common_modules_path = $puppet::params::server_common_modules_path,
$server_git_repo_mode = $puppet::params::server_git_repo_mode,
$server_git_repo_path = $puppet::params::server_git_repo_path,
manifests/params.pp
$server_environments_mode = '0755'
# Where we store our puppet environments
$server_envs_dir = "${codedir}/environments"
# Where remains our manifests dir
$server_manifest_path = "${codedir}/manifests"
# Modules in this directory would be shared across all environments
$server_common_modules_path = ["${server_envs_dir}/common", "${codedir}/modules", "${sharedir}/modules"]
manifests/server.pp
# $envs_dir:: Directory that holds puppet environments
# type:string
#
# $manifest_path:: Path to puppet site.pp manifest (only when
# $git_repo_path and $dynamic_environments
# are false)
# type:string
#
# $common_modules_path:: Common modules paths (only when
# $git_repo_path and $dynamic_environments
# are false)
......
$environments_group = $::puppet::server_environments_group,
$environments_mode = $::puppet::server_environments_mode,
$envs_dir = $::puppet::server_envs_dir,
$manifest_path = $::puppet::server_manifest_path,
$common_modules_path = $::puppet::server_common_modules_path,
$git_repo_mode = $::puppet::server_git_repo_mode,
$git_repo_path = $::puppet::server_git_repo_path,
manifests/server/config.pp
}
}
# make sure your site.pp exists (puppet #15106, foreman #1708) and server_manifest_path too
file { $::puppet::server::manifest_path:
ensure => directory,
owner => $::puppet::server::user,
group => $::puppet::server::group,
mode => '0755',
}
file { "${::puppet::server::manifest_path}/site.pp":
ensure => file,
replace => false,
content => "# site.pp must exist (puppet #15106, foreman #1708)\n",
mode => '0644',
}
# setup empty directories for our environments
puppet::server::env {$::puppet::server::environments: }
}
metadata.json
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 3.1.0 < 5.0.0"
"version_requirement": ">= 3.3.0 < 5.0.0"
}
],
"operatingsystem_support": [
spec/classes/puppet_server_config_spec.rb
:mode => '0755',
})
should contain_file("#{codedir}/manifests/site.pp").with({
:ensure => 'file',
:replace => false,
:content => "# site.pp must exist (puppet #15106, foreman #1708)\n",
})
should contain_puppet__server__env('development')
should contain_puppet__server__env('production')

Also available in: Unified diff