From b5d525175b6b54eda8d9dde6d7eb7880421c6349 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 1 Sep 2014 22:23:06 +0400 Subject: [PATCH] Add hasrestart to some services Hasrestart makes Puppet use restart instead of stop and start to manage a service and many init scripts would work better if used like this. Change-Id: I9e8e86a1c5bf4bcac9683542e9cfb7ca3100c9e8 Closes-Bug: 1364119 --- deployment/puppet/cinder/manifests/api.pp | 3 ++- deployment/puppet/cinder/manifests/backup.pp | 3 ++- deployment/puppet/cinder/manifests/scheduler.pp | 3 ++- deployment/puppet/cinder/manifests/volume.pp | 3 ++- deployment/puppet/neutron/manifests/agents/dhcp.pp | 2 +- deployment/puppet/neutron/manifests/agents/l3.pp | 3 +-- deployment/puppet/neutron/manifests/agents/metadata.pp | 3 ++- deployment/puppet/neutron/manifests/agents/ml2/ovs.pp | 6 +++++- deployment/puppet/neutron/manifests/agents/ovs.pp | 2 +- deployment/puppet/nova/manifests/generic_service.pp | 3 ++- .../puppet/plugin_neutronnsx/manifests/install_ovs.pp | 3 ++- deployment/puppet/swift/manifests/proxy.pp | 2 ++ deployment/puppet/swift/manifests/storage/generic.pp | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/deployment/puppet/cinder/manifests/api.pp b/deployment/puppet/cinder/manifests/api.pp index 3c9d1989f0..4d2f1b1bc8 100644 --- a/deployment/puppet/cinder/manifests/api.pp +++ b/deployment/puppet/cinder/manifests/api.pp @@ -134,7 +134,8 @@ class cinder::api ( ensure => $ensure, name => $::cinder::params::api_service, enable => $enabled, - hasstatus => true, + hasstatus => true, + hasrestart => true, } cinder_config { diff --git a/deployment/puppet/cinder/manifests/backup.pp b/deployment/puppet/cinder/manifests/backup.pp index d78aa80fe1..57f97a96f8 100644 --- a/deployment/puppet/cinder/manifests/backup.pp +++ b/deployment/puppet/cinder/manifests/backup.pp @@ -71,7 +71,8 @@ class cinder::backup ( ensure => $ensure, name => $::cinder::params::backup_service, enable => $enabled, - hasstatus => true, + hasstatus => true, + hasrestart => true, } cinder_config { diff --git a/deployment/puppet/cinder/manifests/scheduler.pp b/deployment/puppet/cinder/manifests/scheduler.pp index 0ebe5958c1..41a8adfc04 100644 --- a/deployment/puppet/cinder/manifests/scheduler.pp +++ b/deployment/puppet/cinder/manifests/scheduler.pp @@ -41,6 +41,7 @@ class cinder::scheduler ( ensure => $ensure, name => $::cinder::params::scheduler_service, enable => $enabled, - hasstatus => true, + hasstatus => true, + hasrestart => true, } } diff --git a/deployment/puppet/cinder/manifests/volume.pp b/deployment/puppet/cinder/manifests/volume.pp index 27d6819d04..c6f74b36fb 100644 --- a/deployment/puppet/cinder/manifests/volume.pp +++ b/deployment/puppet/cinder/manifests/volume.pp @@ -35,6 +35,7 @@ class cinder::volume ( ensure => $ensure, name => $::cinder::params::volume_service, enable => $enabled, - hasstatus => true, + hasstatus => true, + hasrestart => true, } } diff --git a/deployment/puppet/neutron/manifests/agents/dhcp.pp b/deployment/puppet/neutron/manifests/agents/dhcp.pp index 638b744060..5f862b7a85 100644 --- a/deployment/puppet/neutron/manifests/agents/dhcp.pp +++ b/deployment/puppet/neutron/manifests/agents/dhcp.pp @@ -200,7 +200,7 @@ class neutron::agents::dhcp ( enable => true, ensure => running, hasstatus => true, - hasrestart => false, + hasrestart => true, provider => $service_provider, require => [Package[$dhcp_agent_package], Class['neutron'], Service['neutron-ovs-agent-service']], } diff --git a/deployment/puppet/neutron/manifests/agents/l3.pp b/deployment/puppet/neutron/manifests/agents/l3.pp index 62a3b63c5d..bf11f0f2aa 100644 --- a/deployment/puppet/neutron/manifests/agents/l3.pp +++ b/deployment/puppet/neutron/manifests/agents/l3.pp @@ -214,7 +214,7 @@ class neutron::agents::l3 ( enable => true, ensure => running, hasstatus => true, - hasrestart => false, + hasrestart => true, provider => "pacemaker", } @@ -242,4 +242,3 @@ class neutron::agents::l3 ( } } - diff --git a/deployment/puppet/neutron/manifests/agents/metadata.pp b/deployment/puppet/neutron/manifests/agents/metadata.pp index f099a3ef5c..f31dd16371 100644 --- a/deployment/puppet/neutron/manifests/agents/metadata.pp +++ b/deployment/puppet/neutron/manifests/agents/metadata.pp @@ -61,6 +61,8 @@ class neutron::agents::metadata ( name => $::neutron::params::metadata_agent_service, enable => true, ensure => running, + hasstatus => true, + hasrestart => true, } Anchor['neutron-metadata-agent'] -> @@ -153,4 +155,3 @@ class neutron::agents::metadata ( notify{ "Module ${module_name} cannot notify service neutron-metadata-agent on package update": } } } - diff --git a/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp b/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp index 5836b66528..91a4fac11f 100644 --- a/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp +++ b/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp @@ -222,7 +222,9 @@ class neutron::agents::ml2::ovs ( name => $service_name, enable => $enabled, require => Class['neutron'], - provider => $service_provider + provider => $service_provider, + hasstatus => true, + hasrestart => true, } Package <| title == 'neutron-ovs-agent' |> ~> Service['neutron-ovs-agent-service'] @@ -231,6 +233,8 @@ class neutron::agents::ml2::ovs ( ensure => $service_ensure, name => $::neutron::params::ovs_cleanup_service, enable => $enabled, + hasstatus => true, + hasrestart => true, } Package <| title == 'neutron-ovs-agent' |> ~> Service['ovs-cleanup-service'] } diff --git a/deployment/puppet/neutron/manifests/agents/ovs.pp b/deployment/puppet/neutron/manifests/agents/ovs.pp index 627f0a65de..599f95c9f5 100644 --- a/deployment/puppet/neutron/manifests/agents/ovs.pp +++ b/deployment/puppet/neutron/manifests/agents/ovs.pp @@ -156,7 +156,7 @@ class neutron::agents::ovs ( enable => true, ensure => running, hasstatus => true, - hasrestart => false, + hasrestart => true, provider => $service_provider, } diff --git a/deployment/puppet/nova/manifests/generic_service.pp b/deployment/puppet/nova/manifests/generic_service.pp index 2ead9bda59..5dde96dec2 100644 --- a/deployment/puppet/nova/manifests/generic_service.pp +++ b/deployment/puppet/nova/manifests/generic_service.pp @@ -54,7 +54,8 @@ define nova::generic_service( ensure => $service_ensure, name => $service_name, enable => $enabled, - hasstatus => true, + hasstatus => true, + hasrestart => true, require => [Package['nova-common'], Package[$package_name]], } } diff --git a/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp b/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp index fbf1d57f1f..a30ff8dce3 100644 --- a/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp +++ b/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp @@ -67,7 +67,8 @@ class plugin_neutronnsx::install_ovs ( service { 'nicira-ovs-hypervisor-node': ensure => running, enable => true, - hasstatus => true, + hasstatus => true, + hasrestart => true, } Service['nicira-ovs-hypervisor-node'] -> Service['openvswitch-service'] diff --git a/deployment/puppet/swift/manifests/proxy.pp b/deployment/puppet/swift/manifests/proxy.pp index 9ec22dec6a..2e35a9d3f1 100644 --- a/deployment/puppet/swift/manifests/proxy.pp +++ b/deployment/puppet/swift/manifests/proxy.pp @@ -119,6 +119,8 @@ class swift::proxy( name => $::swift::params::proxy_service_name, ensure => running, enable => true, + hasstatus => true, + hasrestart => true, provider => $::swift::params::service_provider, require => [Concat['/etc/swift/proxy-server.conf']], subscribe => [Concat['/etc/swift/proxy-server.conf']], diff --git a/deployment/puppet/swift/manifests/storage/generic.pp b/deployment/puppet/swift/manifests/storage/generic.pp index 59f83ca6f1..0f874fa1e5 100644 --- a/deployment/puppet/swift/manifests/storage/generic.pp +++ b/deployment/puppet/swift/manifests/storage/generic.pp @@ -53,7 +53,8 @@ define swift::storage::generic( name => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"), ensure => running, enable => true, - hasstatus => true, + hasstatus => true, + hasrestart => true, provider => $service_provider, subscribe => Package["swift-${name}"], }