Revert "mistral: configure heartbeat parameters to avoid action timeout"

This reverts commit 374fafd66a.

The root cause of the timeout has been addressed by:
Id22b1465d6d2424d90781983b970aba4545feb8a

We don't need that horrible hack.
Related-Bug: #1826281

Change-Id: I5f1c89e7fad7624c2edbf557ec39f5777b089d55
(cherry picked from commit 738486f108)
This commit is contained in:
Emilien Macchi 2019-05-04 14:52:22 +00:00
parent 715761ed19
commit f5ef977e1c
3 changed files with 0 additions and 45 deletions

View File

@ -71,38 +71,6 @@ parameters:
Messaging client subscriber parameter to specify
an SSL connection to the messaging host.
type: string
MistralMaxMissedHeartbeats:
type: number
default: 15
description: >
The maximum amount of missed heartbeats to be allowed.
If set to 0 then this feature is disabled. See check_interval for more
details.
constraints:
- range: { min: 0 }
MistralCheckInterval:
type: number
default: 20
description: >
How often (in seconds) action executions are checked.
For example when check_interval is 10, check action
executions every 10 seconds. When the checker runs it will
transit all running action executions to error if the last
heartbeat received is older than 10 * max_missed_heartbeats
seconds. If set to 0 then this feature is disabled.
constraints:
- range: { min: 0 }
MistralFirstHeartbeatTimeout:
type: number
default: 3600
description: >
The first heartbeat is handled differently, to provide a
grace period in case there is no available executor to handle
the action execution. For example when
first_heartbeat_timeout = 3600, wait 3600 seconds before
closing the action executions that never received a heartbeat.
constraints:
- range: { min: 0 }
parameter_groups:
- label: deprecated
@ -143,9 +111,6 @@ outputs:
- {get_param: Debug }
- {get_param: MistralDebug }
mistral::rpc_response_timeout: 120
mistral::max_missed_heartbeats: {get_param: MistralMaxMissedHeartbeats}
mistral::check_interval: {get_param: MistralCheckInterval}
mistral::first_heartbeat_timeout: {get_param: MistralFirstHeartbeatTimeout}
mistral::keystone::authtoken::project_name: 'service'
mistral::keystone::authtoken::user_domain_name: 'Default'
mistral::keystone::authtoken::project_domain_name: 'Default'

View File

@ -141,10 +141,6 @@ parameter_defaults:
MistralExecutionFieldSizeLimit: 16384
MistralExecutorVolumes:
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
# https://bugs.launchpad.net/tripleo/+bug/1821611
MistralMaxMissedHeartbeats: 30
MistralCheckInterval: 40
MistralFirstHeartBeatTimeout: 7200
NeutronServicePlugins: router,segments
NeutronMechanismDrivers: ['openvswitch', 'baremetal']
NeutronNetworkVLANRanges: 'physnet1:1000:2999'

View File

@ -1,6 +0,0 @@
---
fixes:
- |
Allow to configure Mistral parameters for Heartbeat and set sane defaults
for the Undercloud so we can deploy an Overcloud in Stein.
Fixes `bug 1821611 <https://bugs.launchpad.net/tripleo/+bug/1821611>`__.