diff --git a/manifests/agent.pp b/manifests/agent.pp index 5c4886c8e3..f68e987a43 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -103,7 +103,6 @@ Enum['sensuctl','sensu_api'] $agent_entity_config_provider = 'sensu_api', Boolean $validate_entity = true, ) { - include sensu include sensu::common include sensu::api @@ -208,8 +207,8 @@ before => Package['sensu-go-agent'], } } elsif $package_source { - $package_provider = undef - $_package_source = $package_source + $package_provider = undef + $_package_source = $package_source } else { include chocolatey $package_provider = 'chocolatey' diff --git a/manifests/backend.pp b/manifests/backend.pp index 62bbc1c8a1..6b891bd628 100644 --- a/manifests/backend.pp +++ b/manifests/backend.pp @@ -174,7 +174,6 @@ Integer $postgresql_batch_workers = 20, Boolean $postgresql_enable_round_robin = false, ) { - if $license_source and $license_content { fail('sensu::backend: Do not define both license_source and license_content') } diff --git a/manifests/cli.pp b/manifests/cli.pp index dbb6946310..ff1208b9a0 100644 --- a/manifests/cli.pp +++ b/manifests/cli.pp @@ -37,7 +37,6 @@ Optional[Enum['tabular','json','wrapped-json','yaml']] $config_format = undef, Optional[String] $config_namespace = undef, ) { - include sensu include sensu::common diff --git a/manifests/init.pp b/manifests/init.pp index fd7b0a2d21..1854b7e153 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -84,7 +84,6 @@ Boolean $validate_namespaces = true, Boolean $validate_api = true, ) { - if $ssl_ca_content { $_ssl_ca_source = undef } else { @@ -151,5 +150,4 @@ } include sensu::resources - } diff --git a/manifests/plugins.pp b/manifests/plugins.pp index 1d47cf7422..833c41f12d 100644 --- a/manifests/plugins.pp +++ b/manifests/plugins.pp @@ -44,7 +44,6 @@ Variant[Array, Hash] $plugins = [], Variant[Array, Hash] $extensions = [], ) { - if $facts['os']['family'] == 'windows' { fail('sensu::plugins is not supported on Windows') } @@ -71,7 +70,7 @@ $dependencies.each |$package| { Package[$package] -> Sensu_plugin <| |> # lint:ignore:spaceship_operator_without_tag } - ensure_packages($gem_dependencies, {'provider' => 'sensu_gem', 'require' => [Package[$dependencies],Package['sensu-plugins-ruby']]}) + ensure_packages($gem_dependencies, { 'provider' => 'sensu_gem', 'require' => [Package[$dependencies],Package['sensu-plugins-ruby']] }) if $plugins =~ Array { $plugins.each |$plugin| { @@ -103,5 +102,4 @@ } } } - } diff --git a/manifests/repo.pp b/manifests/repo.pp index 9436057953..6e701bdcee 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -2,7 +2,6 @@ # @api private # class sensu::repo { - if $facts['os']['family'] == 'RedHat' { if $facts['os']['name'] == 'Amazon' { if $facts['os']['release']['major'] =~ /^201\d$/ {