aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Rakefile2
-rw-r--r--manifests/loadbalancer.pp1
2 files changed, 2 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index bc08f43..7dcaeb9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,7 @@ PuppetLint::RakeTask.new :lint do |config|
config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
config.fail_on_warnings = true
config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
- config.disable_checks = ["80chars", "class_inherits_from_params_class", "class_parameter_defaults", "only_variable_string"]
+ config.disable_checks = ["80chars", "class_inherits_from_params_class", "only_variable_string"]
end
desc "Run acceptance tests"
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 16a4f80..e34b01e 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -814,6 +814,7 @@ class tripleo::loadbalancer (
bind => $nova_novnc_bind_opts,
options => {
'balance' => 'source',
+ 'timeout' => [ 'tunnel 1h' ],
},
collect_exported => false,
}