300826e6ad
The default rsyslog configuration on Ubuntu attempts to open /dev/xconsole if it exists, and logs an error if it doesn't (which it normally won't on a headless server anyway). This change installs a modified configuration with the xconsole-related lines commented out. This configuration file is valid at least on Ubuntu Oneiric, Precise and Quantal, which covers the releases we currently use. Change-Id: I68594d489ab50ef25d351162b9dcb50ca003c409 Reviewed-on: https://review.openstack.org/22394 Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins
39 lines
1.1 KiB
Puppet
39 lines
1.1 KiB
Puppet
# == Class: openstack_project::server
|
|
#
|
|
# A server that we expect to run for some time
|
|
class openstack_project::server (
|
|
$iptables_public_tcp_ports = [],
|
|
$iptables_rules4 = [],
|
|
$iptables_rules6 = [],
|
|
$sysadmins = [],
|
|
$certname = $::fqdn
|
|
) {
|
|
class { 'openstack_project::template':
|
|
iptables_public_tcp_ports => $iptables_public_tcp_ports,
|
|
iptables_rules4 => $iptables_rules4,
|
|
iptables_rules6 => $iptables_rules6,
|
|
certname => $certname,
|
|
}
|
|
class { 'exim':
|
|
sysadmin => $sysadmins,
|
|
}
|
|
|
|
# Custom rsyslog config to disable /dev/xconsole noise on Ubuntu servers
|
|
if $::operatingsystem == 'Ubuntu' {
|
|
file { '/etc/rsyslog.d/50-default.conf':
|
|
ensure => present,
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
source =>
|
|
'puppet:///modules/openstack_project/rsyslog.d_50-default.conf',
|
|
replace => true,
|
|
}
|
|
service { 'rsyslog':
|
|
ensure => running,
|
|
hasrestart => true,
|
|
subscribe => File['/etc/rsyslog.d/50-default.conf'],
|
|
}
|
|
}
|
|
}
|