Faidon has submitted this change and it was merged.
Change subject: Workaround fallout from sysctlfile
......................................................................
Workaround fallout from sysctlfile
sysctlfile breaks puppet on all 8.04 systems of ours. Apply a very
hackish patch to workaround it for now.
Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
---
M manifests/base.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/base.pp b/manifests/base.pp
index 28706d6..71b4337 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -303,6 +303,7 @@
refreshonly => true;
}
+ # FIXME: *never* source a file from a module
sysctlfile { 'wikimedia-base':
source =>
'puppet:///modules/sysctlfile/50-wikimedia-base.conf',
number_prefix => '50',
@@ -314,6 +315,13 @@
file { "/etc/sysctl.d/10-ipv6-privacy.conf":
ensure => absent
}
+ } else {
+ # FIXME: this is a super ugly hack but the sysctlfile module is
broken,
+ # relying on a definition to be defined in base.pp to actually work
+ exec { "/sbin/start procps":
+ command => '/bin/true',
+ refreshonly => true,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
