diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 3 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
4 files changed, 15 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' diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 09edef50..f8ffb8fb 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -486,3 +486,7 @@ if hiera('step') >= 3 { hiera_include('controller_classes') } #END STEP 3 + +if hiera('step') >= 4 { + include ::keystone::cron::token_flush +} #END STEP 4 diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index a3eb6e5d..8303245f 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -902,6 +902,8 @@ if hiera('step') >= 3 { } #END STEP 3 if hiera('step') >= 4 { + include ::keystone::cron::token_flush + if $pacemaker_master { # Keystone |