Add crontabs and anacron to rsyslog deps
Closes race condition for rsyslog container trying to add /etc/cron.daily/anacron before crontabs package is installed. Change-Id: I226776d4aaf34ff874c78d78d4264d1118df7617 Closes-Bug: #1425605
This commit is contained in:
parent
62e68af896
commit
84ed8fa6f1
@ -13,10 +13,20 @@ class anacron::config {
|
|||||||
|
|
||||||
case $::operatingsystem {
|
case $::operatingsystem {
|
||||||
/(?i)(centos|redhat)/: {
|
/(?i)(centos|redhat)/: {
|
||||||
# assumes package cronie-anacron were istalled at BM
|
# assumes package cronie-anacron were installed at BM
|
||||||
file { '/etc/anacrontab':
|
file { '/etc/anacrontab':
|
||||||
source => 'puppet:///modules/anacron/anacrontab',
|
source => 'puppet:///modules/anacron/anacrontab',
|
||||||
}
|
}
|
||||||
|
file { '/etc/cron.hourly/':
|
||||||
|
ensure => directory,
|
||||||
|
mode => '0755',
|
||||||
|
owner => 'root',
|
||||||
|
}
|
||||||
|
file { '/etc/cron.d/':
|
||||||
|
ensure => directory,
|
||||||
|
mode => '0755',
|
||||||
|
owner => 'root',
|
||||||
|
}
|
||||||
file { '/etc/cron.d/0hourly':
|
file { '/etc/cron.d/0hourly':
|
||||||
source => 'puppet:///modules/anacron/0hourly',
|
source => 'puppet:///modules/anacron/0hourly',
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
$fuel_settings = parseyaml($astute_settings_yaml)
|
$fuel_settings = parseyaml($astute_settings_yaml)
|
||||||
$fuel_version = parseyaml($fuel_version_yaml)
|
$fuel_version = parseyaml($fuel_version_yaml)
|
||||||
|
|
||||||
|
Class['docker::container'] ->
|
||||||
|
Class['rsyslog::server'] ->
|
||||||
|
Class['openstack::logrotate']
|
||||||
|
|
||||||
class {'docker::container': }
|
class {'docker::container': }
|
||||||
|
|
||||||
class {"::rsyslog::server":
|
class {"::rsyslog::server":
|
||||||
|
@ -10,4 +10,9 @@ class rsyslog::install {
|
|||||||
ensure => $rsyslog::params::package_status
|
ensure => $rsyslog::params::package_status
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if $rsyslog::params::additional_packages {
|
||||||
|
package { $rsyslog::params::additional_packages:
|
||||||
|
ensure => $rsyslog::params::package_status
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ class rsyslog::params {
|
|||||||
# the ISO, and if Fuel would start to use any of RELP features
|
# the ISO, and if Fuel would start to use any of RELP features
|
||||||
#$relp_package_name = 'rsyslog-relp'
|
#$relp_package_name = 'rsyslog-relp'
|
||||||
$relp_package_name = false
|
$relp_package_name = false
|
||||||
|
$additional_packages = ['anacron', 'cron']
|
||||||
$package_status = 'installed'
|
$package_status = 'installed'
|
||||||
$rsyslog_d = '/etc/rsyslog.d/'
|
$rsyslog_d = '/etc/rsyslog.d/'
|
||||||
$rsyslog_conf = '/etc/rsyslog.conf'
|
$rsyslog_conf = '/etc/rsyslog.conf'
|
||||||
@ -26,6 +27,7 @@ class rsyslog::params {
|
|||||||
# the ISO, and if Fuel would start to use any of RELP features
|
# the ISO, and if Fuel would start to use any of RELP features
|
||||||
#$relp_package_name = 'rsyslog-relp'
|
#$relp_package_name = 'rsyslog-relp'
|
||||||
$relp_package_name = false
|
$relp_package_name = false
|
||||||
|
$additional_packages = ['cronie-anacron','crontabs']
|
||||||
$package_status = 'installed'
|
$package_status = 'installed'
|
||||||
$rsyslog_d = '/etc/rsyslog.d/'
|
$rsyslog_d = '/etc/rsyslog.d/'
|
||||||
$rsyslog_conf = '/etc/rsyslog.conf'
|
$rsyslog_conf = '/etc/rsyslog.conf'
|
||||||
|
Loading…
Reference in New Issue
Block a user