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

Jump to bottom

Drop puppetca_split_configs parameter #605

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Drop puppetca_split_configs parameter #605

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
5 changes: 1 addition & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,7 @@
contain foreman_proxy::module::puppetca
foreman_proxy::provider { ['puppetca_hostname_whitelisting', 'puppetca_token_whitelisting']:
}

if $foreman_proxy::puppetca_split_configs {
foreman_proxy::provider { ['puppetca_http_api', 'puppetca_puppet_cert']:
}
foreman_proxy::provider { ['puppetca_http_api', 'puppetca_puppet_cert']:
}

contain foreman_proxy::module::realm
Expand Down
4 changes: 0 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,6 @@
#
# $httpboot_listen_on:: HTTPBoot proxy to listen on https, http, or both
#
# $puppetca_split_configs:: Whether to split the puppetca configs. This is only supported on 1.22+.
# Set to false for older versions.
#
# $puppetca_provider:: Whether to use puppetca_hostname_whitelisting or puppetca_token_whitelisting
#
# $puppetca_sign_all:: Token-whitelisting only: Whether to sign all CSRs without checking their token
Expand Down Expand Up @@ -331,7 +328,6 @@
Boolean $use_sudoersd = $foreman_proxy::params::use_sudoersd,
Boolean $use_sudoers = $foreman_proxy::params::use_sudoers,
Boolean $puppetca = $foreman_proxy::params::puppetca,
Boolean $puppetca_split_configs = $foreman_proxy::params::puppetca_split_configs,
Foreman_proxy::ListenOn $puppetca_listen_on = $foreman_proxy::params::puppetca_listen_on,
Stdlib::Absolutepath $ssldir = $foreman_proxy::params::ssldir,
Stdlib::Absolutepath $puppetdir = $foreman_proxy::params::puppetdir,
Expand Down
1 change: 0 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@

# puppetca settings
$puppetca = true
$puppetca_split_configs = true
$puppetca_provider = 'puppetca_hostname_whitelisting'
$puppetca_listen_on = 'https'
$puppetca_cmd = "${puppet_cmd} cert"
Expand Down
5 changes: 0 additions & 5 deletions templates/puppetca.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@
# PuppetCA management
# Can be true, false, or http/https to enable just one of the protocols
:enabled: <%= @module_enabled %>
<% unless scope.lookupvar("foreman_proxy::puppetca_split_configs") -%>
:ssldir: <%= scope.lookupvar("foreman_proxy::ssldir") %>
<% end -%>

# valid providers:
# - puppetca_hostname_whitelisting (verify CSRs based on a hostname whitelist)
# - puppetca_token_whitelisting (verify CSRs based on a token whitelist)
:use_provider: <%= scope.lookupvar("foreman_proxy::puppetca_provider") %>
<% if scope.lookupvar("foreman_proxy::puppetca_split_configs") -%>

# Puppet version used
:puppet_version: <%= @puppetversion %>
<% end -%>