diff --git a/deployment/puppet/cobbler/templates/kickstart/centos.ks.erb b/deployment/puppet/cobbler/templates/kickstart/centos.ks.erb index b4437466ec..024b69dde1 100644 --- a/deployment/puppet/cobbler/templates/kickstart/centos.ks.erb +++ b/deployment/puppet/cobbler/templates/kickstart/centos.ks.erb @@ -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') diff --git a/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb b/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb index 3a3fe74233..3256af23c3 100644 --- a/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb +++ b/deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb @@ -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') diff --git a/deployment/puppet/nailgun/files/puppet-error.conf b/deployment/puppet/nailgun/files/puppet-error.conf deleted file mode 100644 index d66d2e114a..0000000000 --- a/deployment/puppet/nailgun/files/puppet-error.conf +++ /dev/null @@ -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 diff --git a/deployment/puppet/nailgun/files/puppet-stdout.conf b/deployment/puppet/nailgun/files/puppet-stdout.conf deleted file mode 100644 index bdec9a2b24..0000000000 --- a/deployment/puppet/nailgun/files/puppet-stdout.conf +++ /dev/null @@ -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 diff --git a/deployment/puppet/nailgun/manifests/cobbler.pp b/deployment/puppet/nailgun/manifests/cobbler.pp index ced32e7fb8..a6309e9d24 100644 --- a/deployment/puppet/nailgun/manifests/cobbler.pp +++ b/deployment/puppet/nailgun/manifests/cobbler.pp @@ -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,