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.

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 reports proxy plugin #776

Merged
merged 1 commit into from
Aug 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/plugin/ansible.pp
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
#
# $collections_paths:: Paths where to look for ansible collections
#
# $report_type:: Set to "foreman" for no changes. If set to "proxy",
# the Reports plugin for proxy must be enabled in order
# to actually make use of the new format of reports
#
class foreman_proxy::plugin::ansible (
Boolean $enabled = $foreman_proxy::plugin::ansible::params::enabled,
Foreman_proxy::ListenOn $listen_on = $foreman_proxy::plugin::ansible::params::listen_on,
Expand All @@ -54,13 +50,11 @@
String $callback = $foreman_proxy::plugin::ansible::params::callback,
String $runner_package_name = $foreman_proxy::plugin::ansible::params::runner_package_name,
Array[Stdlib::Absolutepath] $collections_paths = $foreman_proxy::plugin::ansible::params::collections_paths,
Enum['foreman', 'proxy'] $report_type = $foreman_proxy::plugin::ansible::params::report_type,
) inherits foreman_proxy::plugin::ansible::params {
$foreman_url = $foreman_proxy::foreman_base_url
$foreman_ssl_cert = pick($foreman_proxy::foreman_ssl_cert, $foreman_proxy::ssl_cert)
$foreman_ssl_key = pick($foreman_proxy::foreman_ssl_key, $foreman_proxy::ssl_key)
$foreman_ssl_ca = pick($foreman_proxy::foreman_ssl_ca, $foreman_proxy::ssl_ca)
$proxy_url = $foreman_proxy::real_registered_proxy_url

file { "${foreman_proxy::config_dir}/ansible.cfg":
ensure => file,
Expand Down
2 changes: 0 additions & 2 deletions manifests/plugin/ansible/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
$ssh_args = '-o ProxyCommand=none -C -o ControlMaster=auto -o ControlPersist=60s'
$install_runner = true
$collections_paths = ['/etc/ansible/collections', '/usr/share/ansible/collections']
# No reports are redirected by default
$report_type = 'foreman'
case $facts['os']['family'] {
'RedHat': {
$callback = 'theforeman.foreman.foreman'
Expand Down
40 changes: 0 additions & 40 deletions manifests/plugin/reports.pp

This file was deleted.

5 changes: 0 additions & 5 deletions spec/classes/foreman_proxy__plugin__ansible_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
'host_key_checking = False',
'stdout_callback = yaml',
'[callback_foreman]',
'report_type = foreman',
'proxy_url = https://foo.example.com:8443',
'url = https://foo.example.com',
'ssl_key = /etc/puppetlabs/puppet/ssl/private_keys/foo.example.com.pem',
'ssl_cert = /etc/puppetlabs/puppet/ssl/certs/foo.example.com.pem',
Expand All @@ -64,7 +62,6 @@
host_key_checking: true,
stdout_callback: 'debug',
manage_runner_repo: false,
report_type: 'proxy',
}
end

Expand Down Expand Up @@ -95,8 +92,6 @@
'host_key_checking = True',
'stdout_callback = debug',
'[callback_foreman]',
'report_type = proxy',
'proxy_url = https://foo.example.com:8443',
'url = https://foo.example.com',
'ssl_key = /etc/puppetlabs/puppet/ssl/private_keys/foo.example.com.pem',
'ssl_cert = /etc/puppetlabs/puppet/ssl/certs/foo.example.com.pem',
Expand Down
24 changes: 0 additions & 24 deletions spec/classes/foreman_proxy__plugin__reports_spec.rb

This file was deleted.

2 changes: 0 additions & 2 deletions templates/plugin/ansible.cfg.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ roles_path = <%= @roles_path.join(':') %>
collections_paths = <%= @collections_paths.join(':') %>

[callback_foreman]
report_type = <%= @report_type %>
proxy_url = <%= @proxy_url %>
url = <%= @foreman_url %>
ssl_cert = <%= @foreman_ssl_cert %>
ssl_key = <%= @foreman_ssl_key %>
Expand Down
17 changes: 0 additions & 17 deletions templates/plugin/reports.yml.erb

This file was deleted.