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

Fixes #28906 - Remove cdn_ssl_version from module #320

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Fixes #28906 - Remove cdn_ssl_version from module #320

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
4 changes: 0 additions & 4 deletions manifests/application.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# @param rest_client_timeout
# Timeout for Katello rest API
#
# @param cdn_ssl_version
# SSL version used to communicate with the CDN
#
# @param use_pulp_2_for_file
# Configure Katello to use Pulp 2 for file content
#
Expand All @@ -17,7 +14,6 @@
#
class katello::application (
Integer[0] $rest_client_timeout = 3600,
Optional[Enum['SSLv23', 'TLSv1', '']] $cdn_ssl_version = undef,
Boolean $use_pulp_2_for_file = false,
Boolean $use_pulp_2_for_docker = false,
Stdlib::Absolutepath $repo_export_dir = '/var/lib/pulp/katello-export',
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 @@ -26,8 +26,6 @@
#
# $candlepin_oauth_secret:: The OAuth secret for talking to the candlepin API
#
# $cdn_ssl_version:: SSL version used to communicate with the CDN
#
# $num_pulp_workers:: Number of pulp workers to use
#
# $qpid_wcache_page_size:: The size (in KB) of the pages in the write page cache
Expand Down Expand Up @@ -108,7 +106,6 @@
Optional[Integer[1]] $num_pulp_workers = undef,
Integer[0] $pulp_worker_timeout = 60,
Optional[String] $pulp_max_speed = undef,
Optional[Enum['SSLv23', 'TLSv1']] $cdn_ssl_version = undef,

Boolean $enable_ostree = false,
Boolean $enable_yum = true,
Expand Down Expand Up @@ -183,7 +180,6 @@

class { 'katello::application':
rest_client_timeout => $rest_client_timeout,
cdn_ssl_version => $cdn_ssl_version,
use_pulp_2_for_file => $use_pulp_2_for_file,
use_pulp_2_for_docker => $use_pulp_2_for_docker,
repo_export_dir => $repo_export_dir,
Expand Down
2 changes: 0 additions & 2 deletions spec/classes/application_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ class { 'katello::params':
let(:params) do
{
rest_client_timeout: 4000,
cdn_ssl_version: 'TLSv1',
}
end

Expand All @@ -120,7 +119,6 @@ class { 'katello::params':
it 'should generate correct katello.yaml' do
verify_exact_contents(catalogue, '/etc/foreman/plugins/katello.yaml', [
':katello:',
' :cdn_ssl_version: TLSv1',
' :rest_client_timeout: 4000',
' :content_types:',
' :yum: true',
Expand Down
3 changes: 0 additions & 3 deletions templates/katello.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
## Module: puppet-katello

:katello:
<%- unless [nil, :undefined, :undef, ''].include?(@cdn_ssl_version) -%>
:cdn_ssl_version: <%= @cdn_ssl_version %>
<%- end -%>
:rest_client_timeout: <%= @rest_client_timeout %>

:content_types:
Expand Down