openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Fix the timeout for pacemaker systemd resources"

Browse Source
This commit is contained in:
Jenkins 2016-10-04 09:12:27 +00:00 committed by Gerrit Code Review
commit 264d49a255
32 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/profile/base/pacemaker.pp
View File

@ -69,13 +69,6 @@ class tripleo::profile::base::pacemaker (
Class['tripleo::fencing'] -> Class['pacemaker::stonith']
}
# FIXME(gfidente): sets 200secs as default start timeout op
# param; until we can use pcmk global defaults we'll still
# need to add it to every resource which redefines op params
Pacemaker::Resource::Service {
op_params => 'start timeout=200s stop timeout=200s',
}
file { '/var/lib/tripleo/pacemaker-restarts':
ensure => directory,
} ~> Tripleo::Pacemaker::Resource_restart_flag<||>

1
manifests/profile/pacemaker/apache.pp
View File

@ -40,6 +40,7 @@ class tripleo::profile::pacemaker::apache (
if $step >= 5 and $pacemaker_master {
include ::apache::params
pacemaker::resource::service { $::apache::params::service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
verify_on_create => true,
}

2
manifests/profile/pacemaker/ceilometer/agent/central.pp
View File

@ -40,12 +40,14 @@ class tripleo::profile::pacemaker::ceilometer::agent::central (
case downcase(hiera('ceilometer_backend')) {
/mysql/: {
pacemaker::resource::service { $::ceilometer::params::agent_central_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core'],
}
}
default: {
pacemaker::resource::service { $::ceilometer::params::agent_central_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => [Pacemaker::Resource::Ocf['openstack-core'],
Pacemaker::Resource::Service[$::mongodb::params::service_name]],

1
manifests/profile/pacemaker/ceilometer/agent/notification.pp
View File

@ -37,6 +37,7 @@ class tripleo::profile::pacemaker::ceilometer::agent::notification (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::ceilometer::params::agent_notification_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/ceilometer/collector.pp
View File

@ -41,6 +41,7 @@ class tripleo::profile::pacemaker::ceilometer::collector (
Exec<| title == 'galera-ready'|> -> Class['ceilometer::db::mysql']
}
pacemaker::resource::service { $::ceilometer::params::collector_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/cinder/api.pp
View File

@ -48,6 +48,7 @@ class tripleo::profile::pacemaker::cinder::api (
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::api_service :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core'],
}

4
manifests/profile/pacemaker/cinder/backup.pp
View File

@ -54,7 +54,9 @@ class tripleo::profile::pacemaker::cinder::backup (
}
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::backup_service : }
pacemaker::resource::service { $::cinder::params::backup_service :
op_params => 'start timeout=200s stop timeout=200s',
}
}
}

1
manifests/profile/pacemaker/cinder/scheduler.pp
View File

@ -48,6 +48,7 @@ class tripleo::profile::pacemaker::cinder::scheduler (
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::scheduler_service :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
pacemaker::constraint::base { 'cinder-api-then-cinder-scheduler-constraint':

4
manifests/profile/pacemaker/cinder/volume.pp
View File

@ -53,7 +53,9 @@ class tripleo::profile::pacemaker::cinder::volume (
}
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::volume_service : }
pacemaker::resource::service { $::cinder::params::volume_service :
op_params => 'start timeout=200s stop timeout=200s',
}
}
}

2
manifests/profile/pacemaker/glance.pp
View File

@ -92,10 +92,12 @@ class tripleo::profile::pacemaker::glance (
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::glance::params::registry_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core'],
}
pacemaker::resource::service { $::glance::params::api_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/gnocchi/metricd.pp
View File

@ -39,6 +39,7 @@ class tripleo::profile::pacemaker::gnocchi::metricd (
include ::gnocchi::metricd
pacemaker::resource::service { $::gnocchi::params::metricd_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/gnocchi/statsd.pp
View File

@ -39,6 +39,7 @@ class tripleo::profile::pacemaker::gnocchi::statsd (
include ::gnocchi::statsd
pacemaker::resource::service { $::gnocchi::params::statsd_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/haproxy.pp
View File

@ -56,6 +56,7 @@ class tripleo::profile::pacemaker::haproxy (
# of pacemaker VIPs could move into puppet-tripleo or we should
# make use of less specific hiera parameters here for the settings.
pacemaker::resource::service { 'haproxy':
op_params => 'start timeout=200s stop timeout=200s',
clone_params => true,
}

1
manifests/profile/pacemaker/heat/api.pp
View File

@ -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',
}
}

1
manifests/profile/pacemaker/heat/api_cfn.pp
View File

@ -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',
}
}

1
manifests/profile/pacemaker/heat/api_cloudwatch.pp
View File

@ -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',
}
}

1
manifests/profile/pacemaker/heat/engine.pp
View File

@ -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',
}
}

4
manifests/profile/pacemaker/manila.pp
View File

@ -139,7 +139,9 @@ class tripleo::profile::pacemaker::manila (
if $step >= 5 and $pacemaker_master {
# only manila-share is pacemaker managed, and in a/p
pacemaker::resource::service { $::manila::params::share_service : }
pacemaker::resource::service { $::manila::params::share_service :
op_params => 'start timeout=200s stop timeout=200s',
}
}
}

1
manifests/profile/pacemaker/memcached.pp
View File

@ -41,6 +41,7 @@ class tripleo::profile::pacemaker::memcached (
if $step >= 2 and $pacemaker_master {
pacemaker::resource::service { $::memcached::params::service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Class['::memcached'],
}

2
manifests/profile/pacemaker/neutron.pp
View File

@ -91,11 +91,13 @@ class tripleo::profile::pacemaker::neutron (
unless => '/sbin/pcs resource show neutron-server',
} ->
pacemaker::resource::service { $::neutron::params::server_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core']
}
} else {
pacemaker::resource::service { $::neutron::params::server_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core']
}

1
manifests/profile/pacemaker/neutron/dhcp.pp
View File

@ -37,6 +37,7 @@ class tripleo::profile::pacemaker::neutron::dhcp (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::dhcp_agent_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/neutron/l3.pp
View File

@ -37,6 +37,7 @@ class tripleo::profile::pacemaker::neutron::l3 (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::l3_agent_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/neutron/metadata.pp
View File

@ -37,6 +37,7 @@ class tripleo::profile::pacemaker::neutron::metadata (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::metadata_agent_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/neutron/midonet.pp
View File

@ -38,6 +38,7 @@ class tripleo::profile::pacemaker::neutron::midonet (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service {'tomcat':
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/neutron/ovs.pp
View File

@ -38,6 +38,7 @@ class tripleo::profile::pacemaker::neutron::ovs (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::ovs_agent_service:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/nova/api.pp
View File

@ -46,6 +46,7 @@ class tripleo::profile::pacemaker::nova::api (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::api_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/nova/conductor.pp
View File

@ -45,6 +45,7 @@ class tripleo::profile::pacemaker::nova::conductor (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::conductor_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/nova/consoleauth.pp
View File

@ -45,6 +45,7 @@ class tripleo::profile::pacemaker::nova::consoleauth (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::consoleauth_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}

1
manifests/profile/pacemaker/nova/scheduler.pp
View File

@ -44,6 +44,7 @@ class tripleo::profile::pacemaker::nova::scheduler (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::scheduler_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/nova/vncproxy.pp
View File

@ -44,6 +44,7 @@ class tripleo::profile::pacemaker::nova::vncproxy (
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::vncproxy_service_name:
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/sahara/api.pp
View File

@ -43,6 +43,7 @@ class tripleo::profile::pacemaker::sahara::api (
if $step >= 5 and $pacemaker_master {
# Sahara
pacemaker::resource::service { $::sahara::params::api_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}

1
manifests/profile/pacemaker/sahara/engine.pp
View File

@ -42,6 +42,7 @@ class tripleo::profile::pacemaker::sahara::engine (
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::sahara::params::engine_service_name :
op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
}
}