Skip to content

Move parameters to init.pp + more data types #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Move parameters to init.pp + more data types #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35259ce
Remove unused variables in params.pp
ekohl Aug 16, 2021
01fd3cc
Remove unused variable in puppetserver.pp
ekohl Feb 11, 2022
298fe19
Use fact() to deal with missing domain
ekohl Feb 11, 2022
c555354
Use stricter data types
ekohl Aug 16, 2021
24e4f3a
Make pluginsource, pluginfactsource and classfile optional
ekohl Feb 11, 2022
c3b28dc
Remove agent user and group parameters
ekohl Feb 11, 2022
5af7348
Move (where possible) parameters to init.pp
ekohl Aug 16, 2021
02c8d06
Always define the server package
ekohl Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion manifests/agent/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# @api private
class puppet::agent::config inherits puppet::config {
puppet::config::agent{
'classfile': value => $puppet::classfile;
'localconfig': value => '$vardir/localconfig';
'default_schedules': value => false;
'report': value => $puppet::report;
Expand All @@ -14,6 +13,11 @@
'noop': value => $puppet::agent_noop;
'usecacheonfailure': value => $puppet::usecacheonfailure;
}
if $puppet::classfile {
puppet::config::agent {
'classfile': value => $puppet::classfile;
}
}
if $puppet::http_connect_timeout != undef {
puppet::config::agent {
'http_connect_timeout': value => $puppet::http_connect_timeout;
Expand Down
238 changes: 116 additions & 122 deletions manifests/init.pp
View file
Open in desktop

Large diffs are not rendered by default.

184 changes: 9 additions & 175 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,12 @@
# Default parameters
# @api private
class puppet::params {

# Basic config
$version = 'present'
$manage_user = true
$user = 'puppet'
$group = 'puppet'
$ip = '0.0.0.0'
$port = 8140
$splay = false
$splaylimit = 1800
$runinterval = 1800
$runmode = 'service'
$report = true

# Not defined here as the commands depend on module parameter "dir"
$cron_cmd = undef
$systemd_cmd = undef

$agent_noop = false
$show_diff = false
$module_repository = undef
$hiera_config = '$confdir/hiera.yaml'
$usecacheonfailure = true
$ca_server = undef
$ca_port = undef
$ca_crl_filepath = undef
$server_crl_enable = undef
$prerun_command = undef
$postrun_command = undef
$server_compile_mode = undef
$dns_alt_names = []
$use_srv_records = false

if defined('$::domain') {
$srv_domain = $facts['networking']['domain']
} else {
$srv_domain = undef
}

# lint:ignore:puppet_url_without_modules
$pluginsource = 'puppet:///plugins'
$pluginfactsource = 'puppet:///pluginfacts'
# lint:endignore
$classfile = '$statedir/classes.txt'
$syslogfacility = undef
$environment = $::environment

$server_user = 'puppet'
$server_group = 'puppet'
$srv_domain = fact('networking.domain')
$environment = $::environment
# aio_agent_version is a core fact that's empty on non-AIO
$aio_package = fact('aio_agent_version') =~ String[1]

$systemd_randomizeddelaysec = 0
$aio_package = fact('aio_agent_version') =~ String[1]

case $facts['os']['family'] {
'Windows' : {
Expand Down Expand Up @@ -158,20 +113,11 @@
}
}

$http_connect_timeout = undef
$http_read_timeout = undef

$autosign = "${dir}/autosign.conf"
$autosign_entries = []
$autosign_mode = '0664'
$autosign_content = undef
$autosign_source = undef

$puppet_cmd = "${bindir}/puppet"
$puppetserver_cmd = "${bindir}/puppetserver"

$manage_packages = true

if $facts['os']['family'] == 'Windows' {
$dir_owner = undef
$dir_group = undef
Expand All @@ -185,93 +131,43 @@
default => undef,
}

$package_source = undef
$package_install_options = undef

# Need your own config templates? Specify here:
$auth_template = 'puppet/auth.conf.erb'

# Allow any to the CRL. Needed in case of puppet CA proxy
$allow_any_crl_auth = false

# Authenticated nodes to allow
$auth_allowed = ['$1']

# Will this host be a puppet agent ?
$agent = true
$client_certname = $::clientcert

if defined('$::puppetmaster') {
$puppetmaster = $::puppetmaster
} else {
$puppetmaster = undef
}

# Hashes containing additional settings
$additional_settings = {}
$agent_additional_settings = {}
$server_additional_settings = {}

# Will this host be a puppetmaster?
$server = false
$server_ca = true
$server_ca_crl_sync = false
$server_reports = 'foreman'
$server_external_nodes = "${dir}/node.rb"
$server_trusted_external_command = undef
$server_request_timeout = 60
$server_certname = $::clientcert
$server_strict_variables = false
$server_http = false
$server_http_port = 8139

# Need a new master template for the server?
$server_template = 'puppet/server/puppet.conf.erb'
# Template for server settings in [main]
$server_main_template = 'puppet/server/puppet.conf.main.erb'

# Set 'false' for static environments, or 'true' for git-based workflow
$server_git_repo = false
# Git branch to puppet env mapping for the post receive hook
$server_git_branch_map = {}

# Owner of the environments dir: for cases external service needs write
# access to manage it.
$server_environments_owner = $user
$server_environments_owner = $server_user
$server_environments_group = $root_group
$server_environments_mode = '0755'
# Where we store our puppet environments
$server_envs_dir = ["${codedir}/environments"]
$server_envs_target = undef
# Modules in this directory would be shared across all environments
$server_common_modules_path = unique(["${server_envs_dir[0]}/common", "${codedir}/modules", "${sharedir}/modules", '/usr/share/puppet/modules'])

# Dynamic environments config, ignore if the git_repo is 'false'
# Path to the repository
$server_git_repo_path = "${vardir}/puppet.git"
# mode of the repository
$server_git_repo_mode = '0755'
# user of the repository
$server_git_repo_user = $user
$server_git_repo_user = $server_user
# group of the repository
$server_git_repo_group = $user
# Override these if you need your own hooks
$server_post_hook_content = 'puppet/server/post-receive.erb'
$server_post_hook_name = 'post-receive'
$server_custom_trusted_oid_mapping = undef

$server_storeconfigs = false
$server_git_repo_group = $server_group

$puppet_major = regsubst($::puppetversion, '^(\d+)\..*$', '\1')

if ($facts['os']['family'] =~ /(FreeBSD|DragonFly)/) {
$server_package = "puppetserver${puppet_major}"
} else {
$server_package = undef
$server_package = 'puppetserver'
}

$server_ssl_dir = $ssldir
$server_version = undef

if $aio_package {
$client_package = ['puppet-agent']
Expand All @@ -284,8 +180,6 @@
# Puppet service name
$service_name = 'puppet'

# Puppet onedshot systemd service and timer name
$systemd_unit_name = 'puppet-run'
# Mechanisms to manage and reload/restart the agent
# If supported on the OS, reloading is prefered since it does not kill a currently active puppet run
if $facts['service_provider'] == 'systemd' {
Expand Down Expand Up @@ -317,22 +211,11 @@

# Foreman parameters
$lower_fqdn = downcase($facts['networking']['fqdn'])
$server_foreman = true
$server_foreman_facts = true
$server_puppet_basedir = $aio_package ? {
true => '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet',
false => undef,
}
$server_foreman_url = "https://${lower_fqdn}"
$server_foreman_ssl_ca = undef
$server_foreman_ssl_cert = undef
$server_foreman_ssl_key = undef

# Which Parser do we want to use? https://docs.puppetlabs.com/references/latest/configuration.html#parser
$server_parser = 'current'

# Timeout for cached environments, changed in puppet 3.7.x
$server_environment_timeout = undef

# puppet server configuration file
$server_jvm_config = $facts['os']['family'] ? {
Expand All @@ -341,10 +224,6 @@
default => '/etc/default/puppetserver',
}

$server_jvm_java_bin = '/usr/bin/java'
$server_jvm_extra_args = undef
$server_jvm_cli_args = undef

# This is some very trivial "tuning". See the puppet reference:
# https://docs.puppet.com/puppetserver/latest/tuning_guide.html
$mem_in_mb = $facts['memory']['system']['total_bytes'] / 1024 / 1024
Expand All @@ -363,20 +242,6 @@
$server_jvm_max_heap_size = '768m'
}

$server_ssl_dir_manage = true
$server_ssl_key_manage = true
$server_default_manifest = false
$server_default_manifest_path = '/etc/puppet/manifests/default_manifest.pp'
$server_default_manifest_content = '' # lint:ignore:empty_string_assignment
$server_max_requests_per_instance = 0
$server_max_queued_requests = 0
$server_max_retry_delay = 1800
$server_multithreaded = false
$server_idle_timeout = 1200000
$server_web_idle_timeout = 30000
$server_connect_timeout = 120000
$server_ca_auth_required = true
$server_ca_client_self_delete = false
$server_admin_api_whitelist = [ 'localhost', $lower_fqdn ]
$server_ca_client_whitelist = [ 'localhost', $lower_fqdn ]
$server_cipher_suites = [
Expand All @@ -387,38 +252,7 @@
'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',
'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384',
]
$server_ssl_protocols = [ 'TLSv1.2' ]
$server_ssl_chain_filepath = undef
$server_check_for_updates = true
$server_environment_class_cache_enabled = false
$server_allow_header_cert_info = false
$server_ca_allow_sans = false
$server_ca_allow_auth_extensions = false
$server_ca_enable_infra_crl = false
$server_max_open_files = undef
$server_environment_vars = {}

$server_puppetserver_version = undef

# Which auth.conf shall we use?
$server_use_legacy_auth_conf = false

# Puppetserver metrics shipping
$server_metrics_jmx_enable = true
$server_metrics_graphite_enable = false
$server_metrics_graphite_host = '127.0.0.1'
$server_metrics_graphite_port = 2003
$server_metrics_server_id = $lower_fqdn
$server_metrics_graphite_interval = 5
$server_metrics_allowed = undef

# Should the /puppet/experimental route be enabled?
$server_puppetserver_experimental = true

# For custom auth.conf settings allow passing in a template
$server_puppetserver_auth_template = undef

# Normally agents can only fetch their own catalogs. If you want some nodes to be able to fetch *any* catalog, add them here.
$server_puppetserver_trusted_agents = []
$server_puppetserver_trusted_certificate_extensions = []
}
14 changes: 7 additions & 7 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
class puppet::server(
Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::autosign,
Array[String] $autosign_entries = $puppet::autosign_entries,
Pattern[/^[0-9]{3,4}$/] $autosign_mode = $puppet::autosign_mode,
Stdlib::Filemode $autosign_mode = $puppet::autosign_mode,
Optional[String] $autosign_content = $puppet::autosign_content,
Optional[String] $autosign_source = $puppet::autosign_source,
String $hiera_config = $puppet::hiera_config,
Expand All @@ -344,7 +344,7 @@
String $group = $puppet::server_group,
String $dir = $puppet::server_dir,
Stdlib::Absolutepath $codedir = $puppet::codedir,
Integer $port = $puppet::server_port,
Stdlib::Port $port = $puppet::server_port,
String $ip = $puppet::server_ip,
Boolean $ca = $puppet::server_ca,
Optional[String] $ca_crl_filepath = $puppet::ca_crl_filepath,
Expand All @@ -355,7 +355,7 @@
Array[String] $ca_client_whitelist = $puppet::server_ca_client_whitelist,
Optional[Puppet::Custom_trusted_oid_mapping] $custom_trusted_oid_mapping = $puppet::server_custom_trusted_oid_mapping,
Boolean $http = $puppet::server_http,
Integer $http_port = $puppet::server_http_port,
Stdlib::Port $http_port = $puppet::server_http_port,
String $reports = $puppet::server_reports,
Stdlib::Absolutepath $puppetserver_vardir = $puppet::server_puppetserver_vardir,
Optional[Stdlib::Absolutepath] $puppetserver_rundir = $puppet::server_puppetserver_rundir,
Expand All @@ -373,11 +373,11 @@
String $default_manifest_content = $puppet::server_default_manifest_content,
String $environments_owner = $puppet::server_environments_owner,
Optional[String] $environments_group = $puppet::server_environments_group,
Pattern[/^[0-9]{3,4}$/] $environments_mode = $puppet::server_environments_mode,
Stdlib::Filemode $environments_mode = $puppet::server_environments_mode,
Array[Stdlib::Absolutepath, 1] $envs_dir = $puppet::server_envs_dir,
Optional[Stdlib::Absolutepath] $envs_target = $puppet::server_envs_target,
Variant[Undef, String[0], Array[Stdlib::Absolutepath]] $common_modules_path = $puppet::server_common_modules_path,
Pattern[/^[0-9]{3,4}$/] $git_repo_mode = $puppet::server_git_repo_mode,
Stdlib::Filemode $git_repo_mode = $puppet::server_git_repo_mode,
Stdlib::Absolutepath $git_repo_path = $puppet::server_git_repo_path,
String $git_repo_group = $puppet::server_git_repo_group,
String $git_repo_user = $puppet::server_git_repo_user,
Expand All @@ -392,7 +392,7 @@
Boolean $ssl_key_manage = $puppet::server_ssl_key_manage,
Array[String] $ssl_protocols = $puppet::server_ssl_protocols,
Optional[Stdlib::Absolutepath] $ssl_chain_filepath = $puppet::server_ssl_chain_filepath,
Optional[Variant[String, Array[String]]] $package = $puppet::server_package,
Variant[String, Array[String]] $package = $puppet::server_package,
Optional[String] $version = $puppet::server_version,
String $certname = $puppet::server_certname,
Integer[0] $request_timeout = $puppet::server_request_timeout,
Expand Down Expand Up @@ -429,7 +429,7 @@
Boolean $metrics_jmx_enable = $puppet::server_metrics_jmx_enable,
Boolean $metrics_graphite_enable = $puppet::server_metrics_graphite_enable,
String $metrics_graphite_host = $puppet::server_metrics_graphite_host,
Integer $metrics_graphite_port = $puppet::server_metrics_graphite_port,
Stdlib::Port $metrics_graphite_port = $puppet::server_metrics_graphite_port,
String $metrics_server_id = $puppet::server_metrics_server_id,
Integer $metrics_graphite_interval = $puppet::server_metrics_graphite_interval,
Variant[Undef, Array] $metrics_allowed = $puppet::server_metrics_allowed,
Expand Down
4 changes: 2 additions & 2 deletions manifests/server/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@
if $puppet::server::default_manifest and $puppet::server::default_manifest_content != '' {
file { $puppet::server::default_manifest_path:
ensure => file,
owner => $puppet::user,
group => $puppet::group,
owner => $puppet::server::user,
group => $puppet::server::group,
mode => '0644',
content => $puppet::server::default_manifest_content,
}
Expand Down
5 changes: 2 additions & 3 deletions manifests/server/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@
}

if $puppet::manage_packages == true or $puppet::manage_packages == 'server' {
$server_package = pick($puppet::server::package, 'puppetserver')
$server_version = pick($puppet::server::version, $puppet::version)

package { $server_package:
package { $puppet::server::package:
ensure => $server_version,
install_options => $puppet::package_install_options,
}

if $puppet::server::manage_user {
Package[$server_package] -> User[$puppet::server::user]
Package[$puppet::server::package] -> User[$puppet::server::user]
}
}
}
Loading