From 0c7f9c5e482161bff07cb15bf07278eda29b25b7 Mon Sep 17 00:00:00 2001 From: Andrey Nikitin Date: Mon, 21 Mar 2016 13:03:10 +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: I7bd6abf2bc6b10da52fb4dad0c238b7b59cec54b --- manifests/init.pp | 8 ++++---- manifests/js.pp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index ef5f7da..b6136ad 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,12 +16,12 @@ # class kibana ( $discover_nodes = ['localhost:9200'], - $version = 'ruby', - $js_vhost_name = $::fqdn, - $js_vhost_aliases = [], - $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb', $js_elasticsearch_prefix = '/', $js_elasticsearch_url = 'http://localhost:9200', + $js_vhost_aliases = [], + $js_vhost_name = $::fqdn, + $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb', + $version = 'ruby', ) { group { 'kibana': diff --git a/manifests/js.pp b/manifests/js.pp index 21dc383..3ff5f4b 100644 --- a/manifests/js.pp +++ b/manifests/js.pp @@ -15,14 +15,14 @@ # Class to install kibana frontend to logstash. # class kibana::js ( - $vhost_template = 'kibana/dual-elasticsearch.vhost.erb', - $vhost_aliases = [], - $vhost_name = $::fqdn, - $vhost_proxy_timeout = '120', - $vhost_proxy_connect_timeout = '15', $elasticsearch_url = 'http://localhost:9200', $elasticsearch_prefix = '/', # Must contain trailing / $git_revision = 'v3.1.2', + $vhost_aliases = [], + $vhost_name = $::fqdn, + $vhost_proxy_connect_timeout = '15', + $vhost_proxy_timeout = '120', + $vhost_template = 'kibana/dual-elasticsearch.vhost.erb', ) { $base_path = "/opt/kibana/${git_revision}"