Skip to content
This repository was archived by the owner on Dec 20, 2024. It is now read-only.

replace validate_string with datatype #343

Merged
merged 3 commits into from
Apr 13, 2017
Merged

replace validate_string with datatype #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac3f556
replace validate_string with datatype
bastelfreak Mar 14, 2017
274db99
add datatypes to all params in rule.pp
bastelfreak Mar 14, 2017
95781d1
puppet-lint: fix arrow_on_right_operand_line
bastelfreak Apr 11, 2017
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: 3 additions & 3 deletions examples/ssl_example/mco_profile/manifests/middleware/activemq.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
trustcacerts => true,
notify => Class['activemq::service'],
require => File["${confdir}/ca.pem"],
} ->
}

file { "${confdir}/truststore.jks":
owner => 'activemq',
Expand All @@ -90,8 +90,8 @@
File["${confdir}/server_cert.pem"],
File["${confdir}/server_private.pem"],
],
} ->
file { "${confdir}/keystore.jks":
}
-> file { "${confdir}/keystore.jks":
owner => 'activemq',
group => 'activemq',
mode => '0400',
Expand Down
13 changes: 6 additions & 7 deletions manifests/actionpolicy/rule.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Define - mcollective::actionpolicy::rule
define mcollective::actionpolicy::rule(
$agent,
$action = 'allow',
$callerid = '*',
$actions = '*',
$fact_filter = '*',
$classes = '*'
String $agent,
Enum['allow', 'deny'] $action = 'allow',
String $callerid = '*',
String $actions = '*',
String $fact_filter = '*',
String $classes = '*'
) {
validate_string($fact_filter)
datacat_fragment { "mcollective::actionpolicy::rule ${title}":
target => "mcollective::actionpolicy ${agent}",
data => {
Expand Down
4 changes: 2 additions & 2 deletions manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
contain ::mcollective::client::install
contain ::mcollective::client::config

Class['mcollective::client::install'] ->
Class['mcollective::client::config']
Class['mcollective::client::install']
-> Class['mcollective::client::config']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why moving?

From my perspective the old style is nicer.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we agreed somewhere in the IRC to go with the new puppet-lint style. This is recommended by the style guide. We should discuss the style guide if we don't like it, but not disable the linter.

}
4 changes: 2 additions & 2 deletions manifests/common.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
contain ::mcollective::common::install
contain ::mcollective::common::config

Class['mcollective::common::install'] ->
Class['mcollective::common::config']
Class['mcollective::common::install']
-> Class['mcollective::common::config']

}
6 changes: 3 additions & 3 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
contain ::mcollective::server::config
contain ::mcollective::server::service

Class['mcollective::server::install'] ->
Class['mcollective::server::config'] ~>
Class['mcollective::server::service']
Class['mcollective::server::install']
-> Class['mcollective::server::config']
~> Class['mcollective::server::service']
}