summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-25 17:18:34 +0000
committerGerrit Code Review <review@openstack.org>2015-11-25 17:18:34 +0000
commitdafdc1f4efde8c57a8c7160ae0162866496089dc (patch)
tree82e02fc1071603525b69e0b406ceeedd1a6bf153 /manifests
parentae595ce7731f2b286d4ffd280ed735b61d86b63c (diff)
parent4945e2f4d321b31a0dec3ce0a53cf88fcbc41591 (diff)
Merge "Set tunnel timeout for nova_novncproxy"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/loadbalancer.pp1
1 files changed, 1 insertions, 0 deletions
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,
}