Skip to content

puppet-lint fixes #1357

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

Open
pearsondavid wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −11
Open

puppet-lint fixes #1357

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: 2 additions & 3 deletions manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion manifests/backend.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
1 change: 0 additions & 1 deletion manifests/cli.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
Optional[Enum['tabular','json','wrapped-json','yaml']] $config_format = undef,
Optional[String] $config_namespace = undef,
) {

include sensu
include sensu::common

Expand Down
2 changes: 0 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
Boolean $validate_namespaces = true,
Boolean $validate_api = true,
) {

if $ssl_ca_content {
$_ssl_ca_source = undef
} else {
Expand Down Expand Up @@ -151,5 +150,4 @@
}

include sensu::resources

}
4 changes: 1 addition & 3 deletions manifests/plugins.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand All @@ -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| {
Expand Down Expand Up @@ -103,5 +102,4 @@
}
}
}

}
1 change: 0 additions & 1 deletion manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$/ {
Expand Down