diff --git a/manifests/init.pp b/manifests/init.pp index 2dc0aabb..d320afcc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -272,10 +272,6 @@ # # $server_http_port:: Puppet master HTTP port; defaults to 8139. # -# $server_config_version:: How to determine the configuration version. When -# using git_repo, by default a git describe -# approach will be installed. -# # $server_foreman_facts:: Should foreman receive facts from puppet # # $server_foreman:: Should foreman integration be installed @@ -647,7 +643,6 @@ Variant[Undef, String[0], Stdlib::Absolutepath] $server_external_nodes = $puppet::params::server_external_nodes, Optional[Stdlib::Absolutepath] $server_trusted_external_command = $puppet::params::server_trusted_external_command, 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, Boolean $server_git_repo = $puppet::params::server_git_repo, Boolean $server_default_manifest = $puppet::params::server_default_manifest, diff --git a/manifests/params.pp b/manifests/params.pp index 865f64a8..fba53cb7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -231,10 +231,6 @@ # Template for server settings in [main] $server_main_template = 'puppet/server/puppet.conf.main.erb' - # The script that is run to determine the reported manifest version. Undef - # means we determine it in server.pp - $server_config_version = undef - # 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 diff --git a/manifests/server.pp b/manifests/server.pp index c6d76540..2027f5ab 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -119,10 +119,6 @@ # # $codedir:: Override the puppet code directory. # -# $config_version:: How to determine the configuration version. When -# using git_repo, by default a git describe -# approach will be installed. -# # $server_foreman_facts:: Should foreman receive facts from puppet # # $foreman:: Should foreman integration be installed @@ -365,7 +361,6 @@ Variant[Undef, String[0], Stdlib::Absolutepath] $external_nodes = $puppet::server_external_nodes, Optional[Stdlib::Absolutepath] $trusted_external_command = $puppet::server_trusted_external_command, Array[String] $cipher_suites = $puppet::server_cipher_suites, - Optional[String] $config_version = $puppet::server_config_version, Integer[0] $connect_timeout = $puppet::server_connect_timeout, Integer[0] $web_idle_timeout = $puppet::server_web_idle_timeout, Boolean $git_repo = $puppet::server_git_repo, @@ -486,16 +481,6 @@ $ssl_cert = "${ssl_dir}/certs/${certname}.pem" $ssl_cert_key = "${ssl_dir}/private_keys/${certname}.pem" - if $config_version == undef { - if $git_repo { - $config_version_cmd = "git --git-dir ${envs_dir}/\$environment/.git describe --all --long" - } else { - $config_version_cmd = undef - } - } else { - $config_version_cmd = $config_version - } - if versioncmp($real_puppetserver_version, '7.0.0') >= 0 { if $use_legacy_auth_conf { fail('The jruby-puppet.use-legacy-auth-conf setting is removed in Puppetserver 7') diff --git a/spec/classes/puppet_server_spec.rb b/spec/classes/puppet_server_spec.rb index f8d859fa..06f41be6 100644 --- a/spec/classes/puppet_server_spec.rb +++ b/spec/classes/puppet_server_spec.rb @@ -88,7 +88,6 @@ it { should_not contain_puppet__config__master('environment_timeout') } it { should_not contain_puppet__config__master('manifest') } it { should_not contain_puppet__config__master('modulepath') } - it { should_not contain_puppet__config__master('config_version') } it { should_not contain_puppet__config__master('trusted_external_command') } it { should contain_puppet__config__master('external_nodes').with_value("#{etcdir}\/node.rb") } diff --git a/templates/server/environment.conf.erb b/templates/server/environment.conf.erb deleted file mode 100644 index a625f33d..00000000 --- a/templates/server/environment.conf.erb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Managed by Puppet -# -<% if @manifest -%> -manifest = <%= @manifest %> -<% end -%> -<% if @custom_modulepath && @real_modulepath -%> -modulepath = <%= [@real_modulepath].flatten.join(":") %> -<% end -%> -<% if !@config_version.nil? && !@config_version.empty? -%> -config_version = <%= @config_version %> -<% end -%> -<% if @environment_timeout -%> -environment_timeout = <%= @environment_timeout %> -<% end -%>