openstack
/
fuel-library
Code Issues Proposed changes

Add environment value MAILTO="" to all crontabs 

Change-Id: I8ad197aab0275785302c38b93b7715fb77b38871
Closes-Bug: #1603572
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
Maksim Malchuk 2016-07-16 01:50:21 +03:00
parent c98dee990a
commit 8e65f43ee3
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/fuel/manifests/keystone.pp
View File

@ -193,7 +193,7 @@ class fuel::keystone (
cron { 'keystone-flush-token':
ensure => present,
command => 'keystone-manage token_flush',
environment => 'PATH=/bin:/usr/bin:/usr/sbin',
environment => [ 'MAILTO=""', 'PATH=/bin:/usr/bin:/usr/sbin' ],
user => 'keystone',
hour => '1',
require => [ Package['crontabs'], Package['openstack-keystone'] ],

2
deployment/puppet/fuel/manifests/nailgun/server.pp
View File

@ -139,7 +139,7 @@ class fuel::nailgun::server (
cron { 'oswl_cleaner':
ensure => present,
command => 'oswl_cleaner',
environment => 'PATH=/bin:/usr/bin:/usr/sbin',
environment => [ 'MAILTO=""', 'PATH=/bin:/usr/bin:/usr/sbin' ],
user => 'nailgun',
hour => '1',
require => Package['crontabs'],

7
deployment/puppet/openstack/manifests/logrotate.pp
View File

@ -72,8 +72,9 @@ class openstack::logrotate (
}
cron { 'fuel-logrotate':
command => '/usr/bin/fuel-logrotate',
user => 'root',
minute => "*/${interval}",
command => '/usr/bin/fuel-logrotate',
environment => [ 'MAILTO=""', 'PATH=/bin:/usr/bin:/usr/sbin' ],
user => 'root',
minute => "*/${interval}",
}
}

22
deployment/puppet/openstack_tasks/manifests/swift/parts/rebalance_cronjob.pp
View File

@ -18,14 +18,15 @@ class openstack_tasks::swift::parts::rebalance_cronjob(
}
cron { 'swift-rings-rebalance':
ensure => $primary_proxy ? {
ensure => $primary_proxy ? {
true => present,
default => absent,
},
command => '/usr/local/bin/swift-rings-rebalance.sh &>/dev/null',
user => 'swift',
hour => "*/$ring_rebalance_period",
minute => '15',
command => '/usr/local/bin/swift-rings-rebalance.sh &>/dev/null',
environment => [ 'MAILTO=""', 'PATH=/bin:/usr/bin:/usr/sbin' ],
user => 'swift',
hour => "*/$ring_rebalance_period",
minute => '15',
}
# setup a cronjob to download rings periodically on secondaries
@ -41,14 +42,15 @@ class openstack_tasks::swift::parts::rebalance_cronjob(
}
cron { 'swift-rings-sync':
ensure => $primary_proxy ? {
ensure => $primary_proxy ? {
true => absent,
default => present,
},
command => '/usr/local/bin/swift-rings-sync.sh &>/dev/null',
user => 'swift',
hour => "*/$ring_rebalance_period",
minute => '25',
command => '/usr/local/bin/swift-rings-sync.sh &>/dev/null',
environment => [ 'MAILTO=""', 'PATH=/bin:/usr/bin:/usr/sbin' ],
user => 'swift',
hour => "*/$ring_rebalance_period",
minute => '25',
}
}