Remove unused _template options

README.md

@@ -87,13 +87,6 @@ wrapper classes or even your ENC (if it supports param classes). For example:
       server_git_repo => true
     }
 
-    # You need need your own template for puppet.conf?
-    class { '::puppet':
-      agent_template  => 'puppetagent/puppet.conf.core.erb',
-      server          => true,
-      server_template => 'puppetserver/puppet.conf.master.erb',
-    }
-
     # Maybe you're using gitolite, new hooks, and a different port?
     class { '::puppet':
       server                   => true

manifests/config.pp

@@ -7,7 +7,6 @@
   $ca_port             = $::puppet::ca_port,
   $dns_alt_names       = $::puppet::dns_alt_names,
   $listen_to           = $::puppet::listen_to,
-  $main_template       = $::puppet::main_template,
   $module_repository   = $::puppet::module_repository,
   $pluginsource        = $::puppet::pluginsource,
   $pluginfactsource    = $::puppet::pluginfactsource,

manifests/init.pp

@@ -144,9 +144,6 @@
 # $auth_template::                          Use a custom template for the auth
 #                                           configuration.
 #
-# $main_template::                          Use a custom template for the main puppet
-#                                           configuration.
-#
 # $use_srv_records::                        Whether DNS SRV records will be used to resolve
 #                                           the Puppet master
 #
@@ -164,9 +161,6 @@
 #
 # $agent_noop::                             Run the agent in noop mode.
 #
-# $agent_template::                         Use a custom template for the agent puppet
-#                                           configuration.
-#
 # $client_package::                         Install a custom package to provide
 #                                           the puppet client
 #
@@ -248,12 +242,6 @@
 #
 # $server_external_nodes::                  External nodes classifier executable
 #
-# $server_template::                        Which template should be used for master
-#                                           configuration
-#
-# $server_main_template::                   Which template should be used for master
-#                                           related configuration in the [main] section
-#
 # $server_git_repo::                        Use git repository as a source of modules
 #
 # $server_dynamic_environments::            Use $environment in the modulepath
@@ -602,8 +590,6 @@
   Optional[String] $agent_restart_command = $puppet::params::agent_restart_command,
   String $classfile = $puppet::params::classfile,
   String $hiera_config = $puppet::params::hiera_config,
-  String $main_template = $puppet::params::main_template,
-  String $agent_template = $puppet::params::agent_template,
   String $auth_template = $puppet::params::auth_template,
   Boolean $allow_any_crl_auth = $puppet::params::allow_any_crl_auth,
   Array[String] $auth_allowed = $puppet::params::auth_allowed,
@@ -647,8 +633,6 @@
   Optional[String] $server_passenger_ruby = $puppet::params::server_passenger_ruby,
   String $server_httpd_service = $puppet::params::server_httpd_service,
   Variant[Undef, String[0], Stdlib::Absolutepath] $server_external_nodes = $puppet::params::server_external_nodes,
-  String $server_template = $puppet::params::server_template,
-  String $server_main_template = $puppet::params::server_main_template,
   Array[String] $server_cipher_suites = $puppet::params::server_cipher_suites,
   Optional[String] $server_config_version = $puppet::params::server_config_version,
   Integer[0] $server_connect_timeout = $puppet::params::server_connect_timeout,

manifests/params.pp

@@ -181,8 +181,6 @@
   $package_source = undef
 
   # Need your own config templates? Specify here:
-  $main_template   = 'puppet/puppet.conf.erb'
-  $agent_template  = 'puppet/agent/puppet.conf.erb'
   $auth_template   = 'puppet/auth.conf.erb'
 
   # Allow any to the CRL. Needed in case of puppet CA proxy