aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/common.yaml6
-rw-r--r--puppet/hieradata/controller.yaml3
2 files changed, 9 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 272a6688..ab88a69a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -27,3 +27,9 @@ sysctl_settings:
value: 5
net.ipv4.tcp_keepalive_time:
value: 5
+
+nova::rabbit_heartbeat_timeout_threshold: 60
+neutron::rabbit_heartbeat_timeout_threshold: 60
+cinder::rabbit_heartbeat_timeout_threshold: 60
+ceilometer::rabbit_heartbeat_timeout_threshold: 60
+heat::rabbit_heartbeat_timeout_threshold: 60
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 25719709..1ae076d2 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -40,6 +40,9 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
ceilometer::api::keystone_tenant: 'service'
heat::keystone_tenant: 'service'
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+
#swift
swift::proxy::pipeline:
- 'catch_errors'