Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381187 )
Change subject: Stop including role::salt::minions
......................................................................
Stop including role::salt::minions
Change-Id: I5869cc4d72cc7012a2292799479951069f3abf25
---
M modules/profile/manifests/base.pp
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/profile/manifests/base.pp
b/modules/profile/manifests/base.pp
index 3d0d675..49b34b6 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -74,14 +74,6 @@
create_resources('class', {'ssh::server' => $ssh_server_settings})
- # TODO: Fix the whole top-scope variable override thing
- # we currently have for these two
- class { '::role::salt::minions':
- # The minion id comes from DNS and we need /etc/resolv.conf to have
- # search <project>.<site>.wmflabs to have a minion id matching the fqdn
- require => Class['::base::resolving'],
- }
-
class { '::nrpe':
allowed_hosts => $nrpe_allowed_hosts,
}
--
To view, visit https://gerrit.wikimedia.org/r/381187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5869cc4d72cc7012a2292799479951069f3abf25
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
