Skip to content

Commit

Permalink
fix #474 Attribute vars of all object types can be also a string
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbetz
lbetz committed Sep 13, 2018
1 parent ae0eecc commit 79a59b6
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 51 deletions.
22 changes: 11 additions & 11 deletions manifests/object/checkcommand.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
#
#
define icinga2::object::checkcommand(
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
Optional[String] $checkcommand_name = $title,
Array $import = ['plugin-check-command'],
Optional[Variant[Array, String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Hash] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Boolean $template = false,
Pattern[/^\d+$/] $order = '15',
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
Optional[String] $checkcommand_name = $title,
Array $import = ['plugin-check-command'],
Optional[Variant[Array, String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Boolean $template = false,
Pattern[/^\d+$/] $order = '15',
) {

# compose the attributes
Expand Down
20 changes: 10 additions & 10 deletions manifests/object/eventcommand.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@
#
#
define icinga2::object::eventcommand (
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $eventcommand_name = $title,
Optional[Variant[Array,String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Hash] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Array $import = ['plugin-event-command'],
Pattern[/^\d+$/] $order = '20',
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $eventcommand_name = $title,
Optional[Variant[Array, String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Array $import = ['plugin-event-command'],
Pattern[/^\d+$/] $order = '20',
){

# compose the attributes
Expand Down
2 changes: 1 addition & 1 deletion manifests/object/host.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
Array $import = [],
Optional[String] $address = undef,
Optional[String] $address6 = undef,
Optional[Hash] $vars = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Array] $groups = undef,
Optional[String] $display_name = undef,
Optional[String] $check_command = undef,
Expand Down
6 changes: 3 additions & 3 deletions manifests/object/notification.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
String $notification_name = $title,
Optional[String] $host_name = undef,
Optional[String] $service_name = undef,
Optional[Hash] $vars = undef,
Optional[Variant[Array, String]] $users = undef,
Optional[Variant[Array, String]] $user_groups = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Variant[String, Array]] $users = undef,
Optional[Variant[String, Array]] $user_groups = undef,
Optional[Hash] $times = undef,
Optional[String] $command = undef,
Optional[Pattern[/^\d+\.?\d*[d|h|m|s]?$/]] $interval = undef,
Expand Down
22 changes: 11 additions & 11 deletions manifests/object/notificationcommand.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@
#
#
define icinga2::object::notificationcommand (
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $notificationcommand_name = $title,
Optional[Variant[Array, String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Hash] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Boolean $template = false,
Array $import = ['plugin-notification-command'],
Pattern[/^\d+$/] $order = '25',
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $notificationcommand_name = $title,
Optional[Variant[Array, String]] $command = undef,
Optional[Hash] $env = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Integer[1]] $timeout = undef,
Optional[Hash] $arguments = undef,
Boolean $template = false,
Array $import = ['plugin-notification-command'],
Pattern[/^\d+$/] $order = '25',
){

# compose attributes
Expand Down
30 changes: 15 additions & 15 deletions manifests/object/user.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@
#
#
define icinga2::object::user (
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $user_name = $title,
Optional[String] $display_name = undef,
Optional[String] $email = undef,
Optional[String] $pager = undef,
Optional[Hash] $vars = undef,
Optional[Array] $groups = undef,
Optional[Boolean] $enable_notifications = undef,
Optional[String] $period = undef,
Optional[Array] $types = undef,
Optional[Array] $states = undef,
Array $import = [],
Boolean $template = false,
Pattern[/^\d+$/] $order = '75',
Stdlib::Absolutepath $target,
Enum['absent', 'present'] $ensure = present,
String $user_name = $title,
Optional[String] $display_name = undef,
Optional[String] $email = undef,
Optional[String] $pager = undef,
Optional[Variant[String, Hash]] $vars = undef,
Optional[Array] $groups = undef,
Optional[Boolean] $enable_notifications = undef,
Optional[String] $period = undef,
Optional[Array] $types = undef,
Optional[Array] $states = undef,
Array $import = [],
Boolean $template = false,
Pattern[/^\d+$/] $order = '75',
){

# compose attributes
Expand Down

0 comments on commit 79a59b6

Please sign in to comment.