From eaac86d3f405897eb3c55b3d1d5f3e56ce8c6653 Mon Sep 17 00:00:00 2001 From: Andrey Nikitin Date: Mon, 21 Mar 2016 12:51:07 +0300 Subject: [PATCH] Order of the classes parameters is refactored Order and intendation of those parameters are changed to follow Puppet Style Guide recommendation [0]. Moreover, it will allow to an user to find much faster a variable in a list of variables. [0]. https://docs.puppetlabs.com/guides/style_guide.html Change-Id: I6dbfc2fd3769b174e493bd0392a652eca160f2bd --- manifests/fetch_remotes.pp | 8 ++++---- manifests/manage_projects.pp | 4 ++-- manifests/openstackwatch.pp | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manifests/fetch_remotes.pp b/manifests/fetch_remotes.pp index ccd0bee..a565cbc 100644 --- a/manifests/fetch_remotes.pp +++ b/manifests/fetch_remotes.pp @@ -1,10 +1,8 @@ # == Class: jeepyb::fetch_remotes class jeepyb::fetch_remotes( - $ensure = present, - $user = 'gerrit2', - $minute = '*/30', - $logfile = '/var/log/jeepyb_gerritfetchremotes.log', + $ensure = present, + $logfile = '/var/log/jeepyb_gerritfetchremotes.log', $log_options = [ 'compress', 'missingok', @@ -13,6 +11,8 @@ class jeepyb::fetch_remotes( 'notifempty', 'copytruncate', ], + $minute = '*/30', + $user = 'gerrit2', ) { validate_array($log_options) diff --git a/manifests/manage_projects.pp b/manifests/manage_projects.pp index 463481a..8e652b4 100644 --- a/manifests/manage_projects.pp +++ b/manifests/manage_projects.pp @@ -1,8 +1,6 @@ # == Class: jeepyb::manage_projects class jeepyb::manage_projects( - $timeout = 900, # 15 minutes - $logfile = '/var/log/manage_projects.log', $log_options = [ 'compress', 'missingok', @@ -11,6 +9,8 @@ class jeepyb::manage_projects( 'notifempty', 'copytruncate', ], + $logfile = '/var/log/manage_projects.log', + $timeout = 900, # 15 minutes ) { validate_array($log_options) diff --git a/manifests/openstackwatch.pp b/manifests/openstackwatch.pp index 48a8e93..128c17d 100644 --- a/manifests/openstackwatch.pp +++ b/manifests/openstackwatch.pp @@ -1,16 +1,16 @@ # == Class: jeepyb::openstackwatch class jeepyb::openstackwatch( - $swift_username, - $swift_password, $swift_auth_url, + $swift_password, + $swift_username, $json_url, $auth_version = '1.0', - $projects = [], - $mode = 'multiple', - $container = 'rss', - $minute = '18', - $hour = '*', + $container = 'rss', + $hour = '*', + $minute = '18', + $mode = 'multiple', + $projects = [], ) { include ::jeepyb