From 45b2dd0a509ceecc7c4662625aa5a3d771624750 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sat, 1 Apr 2017 17:35:57 +0200
Subject: [PATCH] Fix puppet-lint errors

puppet-lint finally released a new major version that enforces the
not-that-new-anymore puppet style guide. This patch updates the
parameter lists to avoid the "optional parameter listed before required
parameter" lint warnings that are causing the lint jobs to fail.

Change-Id: I3cd3275958e5bdccb353e2a351da5aa9cfca0481
---
 manifests/logstash.pp        | 2 +-
 manifests/logstash_worker.pp | 4 ++--
 manifests/nodepool.pp        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/logstash.pp b/manifests/logstash.pp
index ef56914..524e89a 100644
--- a/manifests/logstash.pp
+++ b/manifests/logstash.pp
@@ -17,11 +17,11 @@
 # Logstash web frontend glue class.
 #
 class openstackci::logstash (
-  $discover_nodes = ['localhost'],
   $statsd_host,
   $subunit2sql_db_host,
   $subunit2sql_db_pass,
   $log_processor_config,
+  $discover_nodes = ['localhost'],
 ) {
 
   class { '::logstash::web':
diff --git a/manifests/logstash_worker.pp b/manifests/logstash_worker.pp
index f6d61f4..43561d8 100644
--- a/manifests/logstash_worker.pp
+++ b/manifests/logstash_worker.pp
@@ -17,14 +17,14 @@
 # Logstash indexer worker glue class.
 #
 class openstackci::logstash_worker (
-  $elasticsearch_nodes = [],
   $log_processor_config,
+  $indexer_conf_template,
+  $elasticsearch_nodes = [],
   $es_heap_size = '1g',
   $es_version = '1.7.3',
   # Increase the indexer max heap size to twice the default.
   # Default is 25% of memory or 1g whichever is less.
   $indexer_java_args = '-Xmx2g',
-  $indexer_conf_template,
   $log_processor_workers = ['A', 'B', 'C', 'D',],
   $es_gw_recover_after_nodes = '5',
   $es_gw_recover_after_time = '5m',
diff --git a/manifests/nodepool.pp b/manifests/nodepool.pp
index 5708879..11d7672 100644
--- a/manifests/nodepool.pp
+++ b/manifests/nodepool.pp
@@ -18,9 +18,9 @@
 class openstackci::nodepool (
   $mysql_root_password,
   $mysql_password,
+  $oscc_file_contents,
   $git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
   $revision = 'master',
-  $oscc_file_contents,
   $environment = {},
   $nodepool_ssh_private_key = '',
   $nodepool_ssh_public_key = '',