Giuseppe Lavagetto has submitted this change and it was merged. Change subject: base::grub: actually use augeas on jessie ......................................................................
base::grub: actually use augeas on jessie As the comment states, augeas on jessie has a fix for the backticks issue, so we can use it to configure /etc/default/grub. The version of augeas on jessie is 1.2.0 though. For reference see the issue: https://fedorahosted.org/augeas/ticket/377 Change-Id: Ie6ee99dc29c6779a0058d5379861728eb50b50dd --- M modules/base/manifests/grub.pp 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved Faidon Liambotis: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/base/manifests/grub.pp b/modules/base/manifests/grub.pp index a776a77..1bf3787 100644 --- a/modules/base/manifests/grub.pp +++ b/modules/base/manifests/grub.pp @@ -1,7 +1,8 @@ class base::grub($ioscheduler = 'deadline') { - # The shellvars_list lens is broken with backticks on older versions of - # Augeas (< jessie), so keep a compatibility version with test/grep/sed - if versioncmp($::augeasversion, '1.3.0') >= 0 { + # The augeas Shellvars_list lens can't handle backticks for + # versions < 1.2.0 (practically every distro older than jessie). + # We fallback to the legacy grep/sed method in that case. + if versioncmp($::augeasversion, '1.2.0') >= 0 { augeas { 'grub2': incl => '/etc/default/grub', -- To view, visit https://gerrit.wikimedia.org/r/291707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6ee99dc29c6779a0058d5379861728eb50b50dd Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
