Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397727 )
Change subject: prometheus: move duplicate include, use profile::base::firewall
......................................................................
prometheus: move duplicate include, use profile::base::firewall
Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1
---
M manifests/site.pp
M modules/role/manifests/prometheus/global.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 4e6abe4..4397bd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1820,7 +1820,6 @@
node /^prometheus200[34]\.codfw\.wmnet$/ {
role(prometheus)
- include ::base::firewall
}
node 'puppetcompiler1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/prometheus/global.pp
b/modules/role/manifests/prometheus/global.pp
index 1c0533e..409ac73 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -3,7 +3,8 @@
description => 'Prometheus server (global)',
}
- include ::base::firewall
+ include ::standard
+ include ::profile::base::firewall
# Pull selected metrics from all DC-local Prometheus servers.
$federation_jobs = [
--
To view, visit https://gerrit.wikimedia.org/r/397727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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
