diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-04 09:12:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-04 09:12:27 +0000 |
| commit | 264d49a255024eba9ea3bf2086c63e9d49b6da11 (patch) | |
| tree | 311c161c9ffee8de04717affcd683a345cf56d72 /manifests/profile/pacemaker/heat | |
| parent | d86516383390f73134b427fe2e4627161840409f (diff) | |
| parent | 0bc59a7362ea5c9a01fe8bf521e19a4014577079 (diff) | |
Merge "Fix the timeout for pacemaker systemd resources"
Diffstat (limited to 'manifests/profile/pacemaker/heat')
| -rw-r--r-- | manifests/profile/pacemaker/heat/api.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/heat/api_cfn.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/heat/api_cloudwatch.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/heat/engine.pp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/heat/api.pp b/manifests/profile/pacemaker/heat/api.pp index 0fc4f8a..7b0987f 100644 --- a/manifests/profile/pacemaker/heat/api.pp +++ b/manifests/profile/pacemaker/heat/api.pp @@ -42,6 +42,7 @@ class tripleo::profile::pacemaker::heat::api ( if $step >= 5 and $pacemaker_master { pacemaker::resource::service { $::heat::params::api_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } diff --git a/manifests/profile/pacemaker/heat/api_cfn.pp b/manifests/profile/pacemaker/heat/api_cfn.pp index 1230c6b..6e40dba 100644 --- a/manifests/profile/pacemaker/heat/api_cfn.pp +++ b/manifests/profile/pacemaker/heat/api_cfn.pp @@ -42,6 +42,7 @@ class tripleo::profile::pacemaker::heat::api_cfn ( if $step >= 5 and $pacemaker_master { pacemaker::resource::service { $::heat::params::api_cfn_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } diff --git a/manifests/profile/pacemaker/heat/api_cloudwatch.pp b/manifests/profile/pacemaker/heat/api_cloudwatch.pp index 6110a0c..9403812 100644 --- a/manifests/profile/pacemaker/heat/api_cloudwatch.pp +++ b/manifests/profile/pacemaker/heat/api_cloudwatch.pp @@ -43,6 +43,7 @@ class tripleo::profile::pacemaker::heat::api_cloudwatch ( if $step >= 5 and $pacemaker_master { # Heat pacemaker::resource::service { $::heat::params::api_cloudwatch_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } diff --git a/manifests/profile/pacemaker/heat/engine.pp b/manifests/profile/pacemaker/heat/engine.pp index 88744ad..bd50dc0 100644 --- a/manifests/profile/pacemaker/heat/engine.pp +++ b/manifests/profile/pacemaker/heat/engine.pp @@ -42,6 +42,7 @@ class tripleo::profile::pacemaker::heat::engine ( if $step >= 5 and $pacemaker_master { pacemaker::resource::service { $::heat::params::engine_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } |