diff --git a/deployment/puppet/anacron/manifests/config.pp b/deployment/puppet/anacron/manifests/config.pp index 7e78dd5887..589bb9c6d1 100644 --- a/deployment/puppet/anacron/manifests/config.pp +++ b/deployment/puppet/anacron/manifests/config.pp @@ -13,10 +13,20 @@ class anacron::config { case $::operatingsystem { /(?i)(centos|redhat)/: { - # assumes package cronie-anacron were istalled at BM + # assumes package cronie-anacron were installed at BM file { '/etc/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': source => 'puppet:///modules/anacron/0hourly', } diff --git a/deployment/puppet/nailgun/examples/rsyslog-only.pp b/deployment/puppet/nailgun/examples/rsyslog-only.pp index 8ddc828595..b46d24bc73 100644 --- a/deployment/puppet/nailgun/examples/rsyslog-only.pp +++ b/deployment/puppet/nailgun/examples/rsyslog-only.pp @@ -1,6 +1,10 @@ $fuel_settings = parseyaml($astute_settings_yaml) $fuel_version = parseyaml($fuel_version_yaml) +Class['docker::container'] -> +Class['rsyslog::server'] -> +Class['openstack::logrotate'] + class {'docker::container': } class {"::rsyslog::server": diff --git a/deployment/puppet/rsyslog/manifests/install.pp b/deployment/puppet/rsyslog/manifests/install.pp index dcae833f3a..7b169558bb 100644 --- a/deployment/puppet/rsyslog/manifests/install.pp +++ b/deployment/puppet/rsyslog/manifests/install.pp @@ -10,4 +10,9 @@ class rsyslog::install { ensure => $rsyslog::params::package_status } } + if $rsyslog::params::additional_packages { + package { $rsyslog::params::additional_packages: + ensure => $rsyslog::params::package_status + } + } } diff --git a/deployment/puppet/rsyslog/manifests/params.pp b/deployment/puppet/rsyslog/manifests/params.pp index 2f5ddabbe2..0465f4f5cb 100644 --- a/deployment/puppet/rsyslog/manifests/params.pp +++ b/deployment/puppet/rsyslog/manifests/params.pp @@ -6,6 +6,7 @@ class rsyslog::params { # the ISO, and if Fuel would start to use any of RELP features #$relp_package_name = 'rsyslog-relp' $relp_package_name = false + $additional_packages = ['anacron', 'cron'] $package_status = 'installed' $rsyslog_d = '/etc/rsyslog.d/' $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 #$relp_package_name = 'rsyslog-relp' $relp_package_name = false + $additional_packages = ['cronie-anacron','crontabs'] $package_status = 'installed' $rsyslog_d = '/etc/rsyslog.d/' $rsyslog_conf = '/etc/rsyslog.conf'