Skip to content
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

Drop Foreman API version parameters #736

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Drop Foreman API version parameters #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 6 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,6 @@
#
# $server_puppet_basedir:: Where is the puppet code base located
#
# $server_enc_api:: What version of enc script to deploy.
#
# $server_report_api:: What version of report processor to deploy.
#
# $server_request_timeout:: Timeout in node.rb script for fetching
# catalog from Foreman (in seconds).
#
Expand Down Expand Up @@ -668,8 +664,6 @@
Optional[Variant[String, Array[String]]] $server_package = $puppet::params::server_package,
Optional[String] $server_version = $puppet::params::server_version,
String $server_certname = $puppet::params::server_certname,
Enum['v2'] $server_enc_api = $puppet::params::server_enc_api,
Enum['v2'] $server_report_api = $puppet::params::server_report_api,
Integer[0] $server_request_timeout = $puppet::params::server_request_timeout,
Boolean $server_strict_variables = $puppet::params::server_strict_variables,
Hash[String, Data] $server_additional_settings = $puppet::params::server_additional_settings,
Expand Down
2 changes: 0 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@
$server_reports = 'foreman'
$server_external_nodes = "${dir}/node.rb"
$server_trusted_external_command = undef
$server_enc_api = 'v2'
$server_report_api = 'v2'
$server_request_timeout = 60
$server_certname = $::clientcert
$server_strict_variables = false
Expand Down
6 changes: 0 additions & 6 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,6 @@
#
# $puppet_basedir:: Where is the puppet code base located
#
# $enc_api:: What version of enc script to deploy.
#
# $report_api:: What version of report processor to deploy.
#
# $compile_mode:: Used to control JRuby's "CompileMode", which may improve performance.
#
#
Expand Down Expand Up @@ -409,8 +405,6 @@
Optional[Variant[String, Array[String]]] $package = $puppet::server_package,
Optional[String] $version = $puppet::server_version,
String $certname = $puppet::server_certname,
Enum['v2'] $enc_api = $puppet::server_enc_api,
Enum['v2'] $report_api = $puppet::server_report_api,
Integer[0] $request_timeout = $puppet::server_request_timeout,
Boolean $strict_variables = $puppet::server_strict_variables,
Hash[String, Data] $additional_settings = $puppet::server_additional_settings,
Expand Down
2 changes: 0 additions & 2 deletions manifests/server/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,6 @@
puppet_home => $puppet::server::puppetserver_vardir,
puppet_basedir => $puppet::server::puppet_basedir,
puppet_etcdir => $puppet::dir,
enc_api => $puppet::server::enc_api,
report_api => $puppet::server::report_api,
timeout => $puppet::server::request_timeout,
ssl_ca => pick($puppet::server::foreman_ssl_ca, $puppet::server::ssl_ca_cert),
ssl_cert => pick($puppet::server::foreman_ssl_cert, $puppet::server::ssl_cert),
Expand Down