Remove limitation on http max-row-limit, + lint and spec fixes.

dgolja · Dec 21, 2017 · 26905ad · 26905ad
1 parent 33c9f50
commit 26905ad
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,19 +18,20 @@ else
 end
 
 group :development, :test do
-  gem 'rake',                       require: false
-  gem 'rspec',                      require: false
-  gem 'rspec-puppet',               require: false
-  gem 'puppetlabs_spec_helper',     require: false
-  gem 'puppet-lint',                require: false
-  gem 'simplecov',                  require: false
-  gem 'puppet_facts',               require: false
-  gem 'json_pure', '~> 1.8',        require: false
-  gem 'json',                       require: false
-  gem 'metadata-json-lint',         require: false
-  gem 'rspec-puppet-facts',         require: false
-  gem 'rubocop', '~> 0.47.0',       require: false if RUBY_VERSION >= '2.3.0'
-  gem 'rubocop-rspec', '~> 1.10.0', require: false if RUBY_VERSION >= '2.3.0'
+  gem 'rake',                        require: false
+  gem 'rspec',                       require: false
+  gem 'rspec-puppet',                require: false
+  gem 'puppetlabs_spec_helper',      require: false
+  gem 'puppet-lint',                 require: false
+  gem 'simplecov',                   require: false
+  gem 'puppet_facts',                require: false
+  gem 'json_pure', '~> 1.8',         require: false
+  gem 'json',                        require: false
+  gem 'rspec-puppet-facts',          require: false
+  gem 'metadata-json-lint', '1.2.2', require: false if RUBY_VERSION.to_f == 2.1
+  gem 'metadata-json-lint', '1.1.0', require: false if RUBY_VERSION.to_f <= 1.9
+  gem 'rubocop', '~> 0.47.0',        require: false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop-rspec', '~> 1.10.0',  require: false if RUBY_VERSION >= '2.3.0'
 end
 
 group :system_tests do

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -38,10 +38,10 @@
   $manage_repos              = $influxdb::params::manage_repos,
 ) inherits influxdb::params {
 
-  anchor { 'influxdb::start': }  ->
-  class { 'influxdb::install': } ->
-  class { 'influxdb::config': }  ->
-  class { 'influxdb::service': } ->
-  anchor { 'influxdb::end': }
-
+  contain ::influxdb::install
+  contain ::influxdb::config
+  contain ::influxdb::service
+  Class[::influxdb::install]
+  -> Class[::influxdb::config]
+  -> Class[::influxdb::service]
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -88,7 +88,7 @@
     'https-certificate'    => '/etc/ssl/influxdb.pem',
     'https-private-key'    => '',
     'shared-sercret'       => '',
-    'max-row-limit'        => 10000,
+    'max-row-limit'        => 0,
     'max-connection-limit' => 0,
     'unix-socket-enabled'  => false,
     'bind-socket'          => '/var/run/influxdb.sock',

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -102,7 +102,7 @@ class { 'influxdb':
               'https-certificate'    => esc_regex('"/etc/ssl/influxdb.pem"'),
               'https-private-key'    => '',
               'shared-sercret'       => '',
-              'max-row-limit'        => 10_000,
+              'max-row-limit'        => 0,
               'max-connection-limit' => 0,
               'unix-socket-enabled'  => false,
               'bind-socket'          => esc_regex('"/var/run/influxdb.sock"')