diff --git a/deployment/puppet/fuel/manifests/keystone.pp b/deployment/puppet/fuel/manifests/keystone.pp index fd255920bc..5a8183a8d5 100644 --- a/deployment/puppet/fuel/manifests/keystone.pp +++ b/deployment/puppet/fuel/manifests/keystone.pp @@ -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'] ], diff --git a/deployment/puppet/fuel/manifests/nailgun/server.pp b/deployment/puppet/fuel/manifests/nailgun/server.pp index 1c9c8315de..ed33f8d2e7 100644 --- a/deployment/puppet/fuel/manifests/nailgun/server.pp +++ b/deployment/puppet/fuel/manifests/nailgun/server.pp @@ -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'], diff --git a/deployment/puppet/openstack/manifests/logrotate.pp b/deployment/puppet/openstack/manifests/logrotate.pp index 17d05a70c1..757e91d91a 100644 --- a/deployment/puppet/openstack/manifests/logrotate.pp +++ b/deployment/puppet/openstack/manifests/logrotate.pp @@ -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}", } } diff --git a/deployment/puppet/openstack_tasks/manifests/swift/parts/rebalance_cronjob.pp b/deployment/puppet/openstack_tasks/manifests/swift/parts/rebalance_cronjob.pp index 1ee22c0168..aee0573272 100644 --- a/deployment/puppet/openstack_tasks/manifests/swift/parts/rebalance_cronjob.pp +++ b/deployment/puppet/openstack_tasks/manifests/swift/parts/rebalance_cronjob.pp @@ -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', } } \ No newline at end of file