summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-05-26 11:47:26 +0200
committervarac <varacanero@zeromail.org>2015-05-26 11:47:26 +0200
commitd5dccfc5cd72188bac66d7433c94b1046b50c7fb (patch)
tree92312a608bf941d5da5bd098d5caa558e934d3fb /puppet/modules/site_apt
parente722c9a2ab06afa0d97914fc033701b65dc8fe24 (diff)
Revert "remove old leap_mx logfile location from check_mk logwatch state file #6964"
This reverts commit 984684f56f15d9d89ea78ffe6ed67dabf3d63208. Needed because: Augeas fails after upgrading augeas packages during same puppetrun, but only on first deploy - https://leap.se/code/issues/6997
Diffstat (limited to 'puppet/modules/site_apt')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp3
-rw-r--r--puppet/modules/site_apt/manifests/preferences/augeas.pp15
2 files changed, 0 insertions, 18 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 75f545d4..c32c29c4 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,4 +1,3 @@
-# setup basic debian package manager configuration
class site_apt {
$sources = hiera('sources')
@@ -32,8 +31,6 @@ class site_apt {
priority => 999
}
- include site_apt::preferences::augeas
-
# All packages should be installed _after_ refresh_apt is called,
# which does an apt-get update.
# There is one exception:
diff --git a/puppet/modules/site_apt/manifests/preferences/augeas.pp b/puppet/modules/site_apt/manifests/preferences/augeas.pp
deleted file mode 100644
index 257d64c4..00000000
--- a/puppet/modules/site_apt/manifests/preferences/augeas.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# install augeas packages from backports
-class site_apt::preferences::augeas {
-
- # i could not get
- # site_config::remove_files::augeas::['rm_old_leap_mx_log_destination']
- # to remove a line matching a regex with the wheezy version of augeas-lenses
- # (0.10.0-1). Therefore we install it from backports
-
- apt::preferences_snippet { 'augeas':
- package => 'augeas-lenses augeas-tools libaugeas0',
- release => "${::lsbdistcodename}-backports",
- priority => 999;
- }
-
-}