summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Nikitin <anikitin@mirantis.com>2016-03-21 13:03:10 +0300
committerAndrey Nikitin <anikitin@mirantis.com>2016-03-21 13:03:26 +0300
commit0c7f9c5e482161bff07cb15bf07278eda29b25b7 (patch)
tree2fba883819efe9264989743b84585ec424e0e4f5
parent183dc2e05b24a2353452b2b30ba78f4bd110c76a (diff)
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
Notes
Notes (review): Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: yolanda.robla <yolanda.robla-mota@hpe.com> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 12 Apr 2016 01:24:03 +0000 Reviewed-on: https://review.openstack.org/295174 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--manifests/init.pp8
-rw-r--r--manifests/js.pp10
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 @@
16# 16#
17class kibana ( 17class kibana (
18 $discover_nodes = ['localhost:9200'], 18 $discover_nodes = ['localhost:9200'],
19 $version = 'ruby',
20 $js_vhost_name = $::fqdn,
21 $js_vhost_aliases = [],
22 $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
23 $js_elasticsearch_prefix = '/', 19 $js_elasticsearch_prefix = '/',
24 $js_elasticsearch_url = 'http://localhost:9200', 20 $js_elasticsearch_url = 'http://localhost:9200',
21 $js_vhost_aliases = [],
22 $js_vhost_name = $::fqdn,
23 $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
24 $version = 'ruby',
25) { 25) {
26 26
27 group { 'kibana': 27 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 @@
15# Class to install kibana frontend to logstash. 15# Class to install kibana frontend to logstash.
16# 16#
17class kibana::js ( 17class kibana::js (
18 $vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
19 $vhost_aliases = [],
20 $vhost_name = $::fqdn,
21 $vhost_proxy_timeout = '120',
22 $vhost_proxy_connect_timeout = '15',
23 $elasticsearch_url = 'http://localhost:9200', 18 $elasticsearch_url = 'http://localhost:9200',
24 $elasticsearch_prefix = '/', # Must contain trailing / 19 $elasticsearch_prefix = '/', # Must contain trailing /
25 $git_revision = 'v3.1.2', 20 $git_revision = 'v3.1.2',
21 $vhost_aliases = [],
22 $vhost_name = $::fqdn,
23 $vhost_proxy_connect_timeout = '15',
24 $vhost_proxy_timeout = '120',
25 $vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
26) { 26) {
27 27
28 $base_path = "/opt/kibana/${git_revision}" 28 $base_path = "/opt/kibana/${git_revision}"