Skip to content

Commit

Permalink
Simplify plugin parameters
Browse files Browse the repository at this point in the history
When all values are static, there's no need to load it via a params
class. It also tightens some parameter types.
  • Loading branch information
ekohl committed Jul 2, 2019
1 parent 4d3dd74 commit d40c691
Show file tree
Hide file tree
Showing 31 changed files with 127 additions and 240 deletions.
26 changes: 13 additions & 13 deletions manifests/plugin/abrt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
# can be set to specific version number, 'latest', 'present' etc.
#
class foreman_proxy::plugin::abrt (
Boolean $enabled = $::foreman_proxy::plugin::abrt::params::enabled,
Foreman_proxy::ListenOn $listen_on = $::foreman_proxy::plugin::abrt::params::listen_on,
Optional[String] $version = $::foreman_proxy::plugin::abrt::params::version,
Optional[String] $group = $::foreman_proxy::plugin::abrt::params::group,
Stdlib::Absolutepath $abrt_send_log_file = $::foreman_proxy::plugin::abrt::params::abrt_send_log_file,
Stdlib::Absolutepath $spooldir = $::foreman_proxy::plugin::abrt::params::spooldir,
Boolean $aggregate_reports = $::foreman_proxy::plugin::abrt::params::aggregate_reports,
Integer[0] $send_period = $::foreman_proxy::plugin::abrt::params::send_period,
Optional[String] $faf_server_url = $::foreman_proxy::plugin::abrt::params::faf_server_url,
Boolean $faf_server_ssl_noverify = $::foreman_proxy::plugin::abrt::params::faf_server_ssl_noverify,
Optional[Stdlib::Absolutepath] $faf_server_ssl_cert = $::foreman_proxy::plugin::abrt::params::faf_server_ssl_cert,
Optional[Stdlib::Absolutepath] $faf_server_ssl_key = $::foreman_proxy::plugin::abrt::params::faf_server_ssl_key,
) inherits foreman_proxy::plugin::abrt::params {
Boolean $enabled = true,
Foreman_proxy::ListenOn $listen_on = 'https',
Optional[String] $version = undef,
Optional[String] $group = undef,
Stdlib::Absolutepath $abrt_send_log_file = '/var/log/foreman-proxy/abrt-send.log',
Stdlib::Absolutepath $spooldir = '/var/spool/foreman-proxy-abrt',
Boolean $aggregate_reports = true,
Integer[0] $send_period = 600,
Optional[String] $faf_server_url = undef,
Boolean $faf_server_ssl_noverify = true,
Optional[Stdlib::Absolutepath] $faf_server_ssl_cert = undef,
Optional[Stdlib::Absolutepath] $faf_server_ssl_key = undef,
) {
foreman_proxy::plugin { 'abrt':
version => $version,
}
Expand Down
15 changes: 0 additions & 15 deletions manifests/plugin/abrt/params.pp

This file was deleted.

17 changes: 8 additions & 9 deletions manifests/plugin/ansible.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@
# $stdout_callback:: Ansible's stdout_callback setting
#
# $roles_path:: Paths where we look for ansible roles.

#
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,
Stdlib::Absolutepath $ansible_dir = $::foreman_proxy::plugin::ansible::params::ansible_dir,
Optional[Stdlib::Absolutepath] $working_dir = $::foreman_proxy::plugin::ansible::params::working_dir,
Boolean $host_key_checking = $::foreman_proxy::plugin::ansible::params::host_key_checking,
String $stdout_callback = $::foreman_proxy::plugin::ansible::params::stdout_callback,
Array[Stdlib::Absolutepath] $roles_path = $::foreman_proxy::plugin::ansible::params::roles_path,
) inherits foreman_proxy::plugin::ansible::params {
Boolean $enabled = true,
Foreman_proxy::ListenOn $listen_on = 'https',
Stdlib::Absolutepath $ansible_dir = '/usr/share/foreman-proxy',
Stdlib::Absolutepath $working_dir = '/tmp',
Boolean $host_key_checking = false,
String $stdout_callback = 'yaml',
Array[Stdlib::Absolutepath] $roles_path = ['/etc/ansible/roles', '/usr/share/ansible/roles']
) {
$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)
Expand Down
10 changes: 0 additions & 10 deletions manifests/plugin/ansible/params.pp

This file was deleted.

1 change: 1 addition & 0 deletions manifests/plugin/chef/params.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Default parameters for the Chef smart proxy plugin
# @api private
class foreman_proxy::plugin::chef::params {
include ::foreman_proxy::params

Expand Down
12 changes: 6 additions & 6 deletions manifests/plugin/dhcp/remote_isc.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
# $omapi_port:: DHCP server OMAPI port
#
class foreman_proxy::plugin::dhcp::remote_isc (
Stdlib::Absolutepath $dhcp_config = $::foreman_proxy::plugin::dhcp::remote_isc::params::dhcp_config,
Stdlib::Absolutepath $dhcp_leases = $::foreman_proxy::plugin::dhcp::remote_isc::params::dhcp_leases,
Optional[String] $key_name = $::foreman_proxy::plugin::dhcp::remote_isc::params::key_name,
Optional[String] $key_secret = $::foreman_proxy::plugin::dhcp::remote_isc::params::key_secret,
Integer[0, 65535] $omapi_port = $::foreman_proxy::plugin::dhcp::remote_isc::params::omapi_port,
) inherits foreman_proxy::plugin::dhcp::remote_isc::params {
Stdlib::Absolutepath $dhcp_config = '/etc/dhcp/dhcpd.conf',
Stdlib::Absolutepath $dhcp_leases = '/var/lib/dhcpd/dhcpd.leases',
Optional[String] $key_name = undef,
Optional[String] $key_secret = undef,
Stdlib::Port $omapi_port = 7911,
) {
foreman_proxy::plugin { 'dhcp_remote_isc':
}
-> foreman_proxy::settings_file { 'dhcp_remote_isc':
Expand Down
7 changes: 0 additions & 7 deletions manifests/plugin/dhcp/remote_isc/params.pp

This file was deleted.

1 change: 1 addition & 0 deletions manifests/plugin/discovery/params.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Default parameters for foreman_proxy::plugin::discovery
# @api private
class foreman_proxy::plugin::discovery::params {
include ::foreman_proxy::params

Expand Down
10 changes: 5 additions & 5 deletions manifests/plugin/dns/infoblox.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# $dns_view:: The Infoblox DNS View
#
class foreman_proxy::plugin::dns::infoblox (
String $dns_server = $::foreman_proxy::plugin::dns::infoblox::params::dns_server,
String $username = $::foreman_proxy::plugin::dns::infoblox::params::username,
String $password = $::foreman_proxy::plugin::dns::infoblox::params::password,
String $dns_view = $::foreman_proxy::plugin::dns::infoblox::params::dns_view,
) inherits foreman_proxy::plugin::dns::infoblox::params {
Stdlib::Host $dns_server = undef,
String $username = undef,
String $password = undef,
String $dns_view = 'default',
) {
foreman_proxy::plugin { 'dns_infoblox':
}
-> foreman_proxy::settings_file { 'dns_infoblox':
Expand Down
6 changes: 0 additions & 6 deletions manifests/plugin/dns/infoblox/params.pp

This file was deleted.

18 changes: 12 additions & 6 deletions manifests/plugin/dns/powerdns.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
#
# $backend:: The backend to select, either mysql or postgresql.
#
# $pdnssec:: pdnssec command to run rectify-zone with. Can be an
# empty string.
#
# === MySQL parameters:
#
# $manage_database:: Whether to manage the database. Only works for
# mysql. Includes the mysql server.
#
# $mysql_hostname:: MySQL server hostname. Only used when the backend is mysql.
#
# $mysql_username:: MySQL server username. Only used when the backend is mysql.
Expand All @@ -14,18 +22,16 @@
#
# $mysql_database:: MySQL server database. Only used when the backend is mysql.
#
# === PostgreSQL parameters:
#
# $postgresql_connection:: The postgresql connection string.
#
# === REST parameters:
#
# $rest_url:: The REST API URL
#
# $rest_api_key:: The REST API key
#
# $manage_database:: Whether to manage the database. Only works for
# mysql. Includes the mysql server.
#
# $pdnssec:: pdnssec command to run rectify-zone with. Can be an
# empty string.
#
class foreman_proxy::plugin::dns::powerdns (
Enum['rest', 'mysql', 'postgresql'] $backend = $::foreman_proxy::plugin::dns::powerdns::params::backend,
String $mysql_hostname = $::foreman_proxy::plugin::dns::powerdns::params::mysql_hostname,
Expand Down
2 changes: 2 additions & 0 deletions manifests/plugin/dns/powerdns/params.pp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# PowerDNS plugin defaults
# @api private
class foreman_proxy::plugin::dns::powerdns::params {
$backend = 'mysql'
$mysql_hostname = 'localhost'
Expand Down
20 changes: 10 additions & 10 deletions manifests/plugin/dynflow.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
# $open_file_limit:: Limit number of open files - Only Red Hat Operating Systems with Software Collections.
#
class foreman_proxy::plugin::dynflow (
Boolean $enabled = $::foreman_proxy::plugin::dynflow::params::enabled,
Foreman_proxy::ListenOn $listen_on = $::foreman_proxy::plugin::dynflow::params::listen_on,
Optional[Stdlib::Absolutepath] $database_path = $::foreman_proxy::plugin::dynflow::params::database_path,
Boolean $console_auth = $::foreman_proxy::plugin::dynflow::params::console_auth,
String $core_listen = $::foreman_proxy::plugin::dynflow::params::core_listen,
Integer[0, 65535] $core_port = $::foreman_proxy::plugin::dynflow::params::core_port,
Optional[Array[String]] $ssl_disabled_ciphers = $::foreman_proxy::plugin::dynflow::params::ssl_disabled_ciphers,
Optional[Array[String]] $tls_disabled_versions = $::foreman_proxy::plugin::dynflow::params::tls_disabled_versions,
Integer[1] $open_file_limit = $::foreman_proxy::plugin::dynflow::params::open_file_limit,
) inherits foreman_proxy::plugin::dynflow::params {
Boolean $enabled = true,
Foreman_proxy::ListenOn $listen_on = 'https',
Optional[Stdlib::Absolutepath] $database_path = undef,
Boolean $console_auth = true,
Stdlib::Host $core_listen = '0.0.0.0',
Stdlib::Port $core_port = 8008,
Optional[Array[String]] $ssl_disabled_ciphers = undef,
Optional[Array[String]] $tls_disabled_versions = undef,
Integer[1] $open_file_limit = 1000000,
) {
if $::foreman_proxy::ssl {
$core_url = "https://${::fqdn}:${core_port}"
} else {
Expand Down
13 changes: 0 additions & 13 deletions manifests/plugin/dynflow/params.pp

This file was deleted.

14 changes: 7 additions & 7 deletions manifests/plugin/monitoring.pp
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
# can be set to specific version number, 'latest', 'present' etc.
#
class foreman_proxy::plugin::monitoring (
Boolean $enabled = $::foreman_proxy::plugin::monitoring::params::enabled,
Optional[String] $group = $::foreman_proxy::plugin::monitoring::params::group,
Foreman_proxy::ListenOn $listen_on = $::foreman_proxy::plugin::monitoring::params::listen_on,
Array[String] $providers = $::foreman_proxy::plugin::monitoring::params::providers,
Optional[String] $version = $::foreman_proxy::plugin::monitoring::params::version,
Boolean $collect_status = $::foreman_proxy::plugin::monitoring::params::collect_status,
) inherits foreman_proxy::plugin::monitoring::params {
Boolean $enabled = true,
Optional[String] $group = undef,
Foreman_proxy::ListenOn $listen_on = 'https',
Array[String] $providers = ['icinga2'],
Optional[String] $version = undef,
Boolean $collect_status = true,
) {
foreman_proxy::plugin { 'monitoring':
version => $version,
}
Expand Down
20 changes: 10 additions & 10 deletions manifests/plugin/monitoring/icinga2.pp
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
# $enabled:: Enable this plugin.
#
class foreman_proxy::plugin::monitoring::icinga2 (
Boolean $enabled = $::foreman_proxy::plugin::monitoring::icinga2::params::enabled,
String $server = $::foreman_proxy::plugin::monitoring::icinga2::params::server,
Integer[0, 65535] $api_port = $::foreman_proxy::plugin::monitoring::icinga2::params::api_port,
Stdlib::Absolutepath $api_cacert = $::foreman_proxy::plugin::monitoring::icinga2::params::api_cacert,
String $api_user = $::foreman_proxy::plugin::monitoring::icinga2::params::api_user,
Stdlib::Absolutepath $api_usercert = $::foreman_proxy::plugin::monitoring::icinga2::params::api_usercert,
Stdlib::Absolutepath $api_userkey = $::foreman_proxy::plugin::monitoring::icinga2::params::api_userkey,
Optional[String] $api_password = $::foreman_proxy::plugin::monitoring::icinga2::params::api_password,
Boolean $verify_ssl = $::foreman_proxy::plugin::monitoring::icinga2::params::verify_ssl,
) inherits foreman_proxy::plugin::monitoring::icinga2::params {
Boolean $enabled = true,
Stdlib::Host $server = $::fqdn,
Stdlib::Port $api_port = 5665,
Stdlib::Absolutepath $api_cacert = '/etc/foreman-proxy/monitoring/ca.crt',
String $api_user = 'foreman',
Stdlib::Absolutepath $api_usercert = '/etc/foreman-proxy/monitoring/foreman.crt',
Stdlib::Absolutepath $api_userkey = '/etc/foreman-proxy/monitoring/foreman.key',
Optional[String] $api_password = undef,
Boolean $verify_ssl = true,
) {
include ::foreman_proxy::plugin::monitoring

foreman_proxy::settings_file { 'monitoring_icinga2':
Expand Down
11 changes: 0 additions & 11 deletions manifests/plugin/monitoring/icinga2/params.pp

This file was deleted.

12 changes: 6 additions & 6 deletions manifests/plugin/monitoring/icingadirector.pp
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
# $enabled:: Enable this plugin.
#
class foreman_proxy::plugin::monitoring::icingadirector (
Boolean $enabled = $::foreman_proxy::plugin::monitoring::icingadirector::params::enabled,
Stdlib::HTTPUrl $director_url = $::foreman_proxy::plugin::monitoring::icingadirector::params::director_url,
Stdlib::Absolutepath $director_cacert = $::foreman_proxy::plugin::monitoring::icingadirector::params::director_cacert,
Optional[String] $director_user = $::foreman_proxy::plugin::monitoring::icingadirector::params::director_user,
Optional[String] $director_password = $::foreman_proxy::plugin::monitoring::icingadirector::params::director_password,
Boolean $verify_ssl = $::foreman_proxy::plugin::monitoring::icingadirector::params::verify_ssl,
Boolean $enabled = true,
Stdlib::HTTPUrl $director_url = "https://${::fqdn}/icingaweb2/director",
Stdlib::Absolutepath $director_cacert = '/etc/foreman-proxy/monitoring/ca.crt',
Optional[String] $director_user = undef,
Optional[String] $director_password = undef,
Boolean $verify_ssl = true,
) inherits foreman_proxy::plugin::monitoring::icingadirector::params {
include ::foreman_proxy::plugin::monitoring

Expand Down
8 changes: 0 additions & 8 deletions manifests/plugin/monitoring/icingadirector/params.pp

This file was deleted.

9 changes: 0 additions & 9 deletions manifests/plugin/monitoring/params.pp

This file was deleted.

16 changes: 8 additions & 8 deletions manifests/plugin/omaha.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
# can be set to specific version number, 'latest', 'present' etc.
#
class foreman_proxy::plugin::omaha (
Boolean $enabled = $::foreman_proxy::plugin::omaha::params::enabled,
Optional[String] $group = $::foreman_proxy::plugin::omaha::params::group,
Foreman_proxy::ListenOn $listen_on = $::foreman_proxy::plugin::omaha::params::listen_on,
Stdlib::Absolutepath $contentpath = $::foreman_proxy::plugin::omaha::params::contentpath,
Integer[0] $sync_releases = $::foreman_proxy::plugin::omaha::params::sync_releases,
Optional[Stdlib::HTTPUrl] $http_proxy = $::foreman_proxy::plugin::omaha::params::http_proxy,
Optional[String] $version = $::foreman_proxy::plugin::omaha::params::version,
) inherits foreman_proxy::plugin::omaha::params {
Boolean $enabled = true,
Optional[String] $group = undef,
Foreman_proxy::ListenOn $listen_on = 'https',
Stdlib::Absolutepath $contentpath = '/var/lib/foreman-proxy/omaha/content',
Integer[0] $sync_releases = 2,
Optional[Stdlib::HTTPUrl] $http_proxy = undef,
Optional[String] $version = undef,
) {
foreman_proxy::plugin { 'omaha':
version => $version,
}
Expand Down
10 changes: 0 additions & 10 deletions manifests/plugin/omaha/params.pp

This file was deleted.

Loading

0 comments on commit d40c691

Please sign in to comment.