Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395546 )
Change subject: standard: assume standard profile structure
......................................................................
standard: assume standard profile structure
Bug: T181971
Change-Id: I4d43fa2d246a99532e1a7b1d27b2d9856b0e8178
---
M modules/standard/manifests/init.pp
1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/395546/1
diff --git a/modules/standard/manifests/init.pp
b/modules/standard/manifests/init.pp
index 17fcbe6..94a375c 100644
--- a/modules/standard/manifests/init.pp
+++ b/modules/standard/manifests/init.pp
@@ -1,10 +1,14 @@
# == Class standard
# Class for *most* servers, standard includes
-
+# Standard is properly a profile. Given its special nature, it has been
+# historically separated and we're keeping it that way for now.
class standard(
- $has_default_mail_relay = true,
- $has_admin = true,
- $has_ganglia = true,
+ # lint:ignore:wmf_styleguide
+ $has_default_mail_relay = hiera('standard::has_default_mail_relay', true),
+ $has_admin = hiera('standard::has_admin', true),
+ $has_ganglia = hiera('standard::has_ganglia', true),
+ $admin_groups = hiera('admin::groups', [])
+ # lint:endignore
) {
include ::profile::base
include ::standard::ntp
@@ -39,7 +43,9 @@
# Some instances in production (ideally none) and labs do not use
# the admin class
if $has_admin {
- include ::admin
+ class { '::admin':
+ groups => $admin_groups
+ }
}
# For historical reasons, users in modules/admin/data/data.yaml
--
To view, visit https://gerrit.wikimedia.org/r/395546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d43fa2d246a99532e1a7b1d27b2d9856b0e8178
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
