Del unused imfile templates for puppet
Newer puppet 3.4.3 has working syslog for puppet apply. Thus we can send messages to syslog easily without usage of ImFile puppet module. Depends on: https://review.openstack.org/#/c/85970/ Partial-bug:#1304286 Change-Id: If4e01c68c1adc640903c69a064d10fe8f585466c Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
parent
6c7a341ce5
commit
1545346703
@ -258,9 +258,6 @@ $SNIPPET('centos_static_net')
|
||||
# Blacklist i2c_piix4 module so it does not create kernel errors
|
||||
$SNIPPET('centos_blacklist_i2c_piix4')
|
||||
|
||||
wget -O /etc/rsyslog.d/20-puppet_stdout.conf "http://$server/cobbler/aux/20-puppet_stdout_syslog.conf"
|
||||
wget -O /etc/rsyslog.d/20-puppet_error.conf "http://$server/cobbler/aux/20-puppet_error_syslog.conf"
|
||||
|
||||
# COBBLER EMBEDDED SNIPPET: 'kickstart_done'
|
||||
# DISABLES PXE BOOTING
|
||||
$SNIPPET('kickstart_done')
|
||||
|
@ -125,8 +125,6 @@ echo 'deb http://@@server@@:8080/ubuntu/fuelweb/x86_64 precise main' > /target/e
|
||||
$SNIPPET('ubuntu_authorized_keys')
|
||||
sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" -e "s/.*PasswordAuthentication\ .*/PasswordAuthentication\ no/g" -e "/UseDNS/d" /target/etc/ssh/sshd_config && \
|
||||
echo "UseDNS no" >> /target/etc/ssh/sshd_config && \
|
||||
in-target wget -O /etc/rsyslog.d/20-puppet_stdout.conf "http://$server/cobbler/aux/20-puppet_stdout_syslog.conf" && \
|
||||
in-target wget -O /etc/rsyslog.d/20-puppet_error.conf "http://$server/cobbler/aux/20-puppet_error_syslog.conf" && \
|
||||
in-target apt-get -y install linux-image-3.11 linux-headers-3.11 && \
|
||||
$SNIPPET('ubuntu_blacklist_i2c_piix4')
|
||||
$SNIPPET('ubuntu_static_net')
|
||||
|
@ -1,11 +0,0 @@
|
||||
# file is managed by puppet
|
||||
|
||||
$ModLoad imfile
|
||||
|
||||
$InputFileName /var/log/puppet/puppet.err
|
||||
$InputFileTag puppet-error
|
||||
$InputFileStateFile state-puppet-error
|
||||
$InputFileSeverity error
|
||||
$InputFileFacility daemon
|
||||
$InputFilePollInterval 10
|
||||
$InputRunFileMonitor
|
@ -1,11 +0,0 @@
|
||||
# file is managed by puppet
|
||||
|
||||
$ModLoad imfile
|
||||
|
||||
$InputFileName /var/log/puppet/puppet.stdout
|
||||
$InputFileTag puppet-stdout
|
||||
$InputFileStateFile state-puppet-stdout
|
||||
$InputFileSeverity notice
|
||||
$InputFileFacility daemon
|
||||
$InputFilePollInterval 10
|
||||
$InputRunFileMonitor
|
@ -51,21 +51,6 @@ class nailgun::cobbler(
|
||||
}
|
||||
|
||||
# ADDING send2syslog.py SCRIPT AND CORRESPONDING SNIPPET
|
||||
file { "/var/www/cobbler/aux/20-puppet_stdout_syslog.conf":
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => "puppet:///modules/nailgun/puppet-stdout.conf",
|
||||
require => Class['::cobbler::server'],
|
||||
}
|
||||
|
||||
file { "/var/www/cobbler/aux/20-puppet_error_syslog.conf":
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => "puppet:///modules/nailgun/puppet-error.conf",
|
||||
require => Class['::cobbler::server'],
|
||||
}
|
||||
|
||||
package { "send2syslog":
|
||||
ensure => installed,
|
||||
|
Loading…
Reference in New Issue
Block a user