coren has submitted this change and it was merged.
Change subject: Tools: Include mediawiki::multimedia::fonts in exec_environ
......................................................................
Tools: Include mediawiki::multimedia::fonts in exec_environ
When I previously included mediawiki::multimedia::fonts in
role::labs::tools::execnode to resolve bug #58740 in change
I421685039b7ae9f73535ac92b3d8b6e5ecf1b1ac, I did so under the
apparently wrong impression that only roles should include classes.
The net effect however was that the fonts were only installed on
"true" execution nodes and not on the bastion or webserver nodes,
making for a rather strange setup.
At user request and with more logic, this change moves the include to
toollabs::exec_environ so that the fonts are installed on all nodes
where they are actually expected and needed.
Bug: 66354
Change-Id: Ie071002eef9d4824d7b70de0c6bdeb679450cca4
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 5aec7bf..e1c9789 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -24,7 +24,6 @@
class { 'toollabs::execnode':
gridmaster => $grid_master,
}
- include ::mediawiki::multimedia::fonts
}
class webnode inherits role::labs::tools::config {
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index a669ea8..aa71208 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -18,6 +18,7 @@
class toollabs::exec_environ {
include generic::locales::international
include identd
+ include mediawiki::multimedia::fonts
package { [
# Please keep all packages in each group sorted in alphabetical order
--
To view, visit https://gerrit.wikimedia.org/r/151440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie071002eef9d4824d7b70de0c6bdeb679450cca4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
