Faidon Liambotis has submitted this change and it was merged.
Change subject: base: do not include grub in Labs Ubuntus
......................................................................
base: do not include grub in Labs Ubuntus
Labs instances before jessie do not currently use GRUB 2, but use GRUB 1
instead (cf. T140100). All of our base::grub class is depending on GRUB
2, so there is no point in including that class and can be harmful as
well (code failing) once we shuffle things around.
Add a -hopefully temporary- $realm/os_version guard around the include
that can be removed as soon as we install grub-pc in Labs.
Change-Id: Ie1009d95c93e6bfa8c861f15ec887f0aba19d1f5
---
M modules/base/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 5135102..e93bfd6 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -14,8 +14,13 @@
server => $puppetmaster,
}
+ # Temporary workaround for T140100. Remove as soon as Labs instances get
+ # grub-pc or trusty gets phased out from Labs, whichever comes first.
+ if ($::realm == 'production') or (os_version('debian >= jessie')) {
+ include base::grub
+ }
+
include passwords::root
- include base::grub
include base::resolving
include ::rsyslog
include base::remote_syslog
--
To view, visit https://gerrit.wikimedia.org/r/298490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1009d95c93e6bfa8c861f15ec887f0aba19d1f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
