Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397727 )
Change subject: prometheus: move duplicate firewall/standard include ...................................................................... prometheus: move duplicate firewall/standard include Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1 --- M manifests/site.pp M modules/role/manifests/prometheus/global.pp 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/397727/1 diff --git a/manifests/site.pp b/manifests/site.pp index 10d8be1..6679931 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1966,8 +1966,6 @@ role(prometheus::ops, prometheus::global, prometheus::services, prometheus::analytics, prometheus::k8s) - include ::base::firewall - include ::standard include ::lvs::realserver interface::add_ip6_mapped { 'main': } diff --git a/modules/role/manifests/prometheus/global.pp b/modules/role/manifests/prometheus/global.pp index a1302c0..8476659 100644 --- a/modules/role/manifests/prometheus/global.pp +++ b/modules/role/manifests/prometheus/global.pp @@ -3,6 +3,7 @@ description => 'Prometheus server (global)', } + include ::standard include ::base::firewall # Pull selected metrics from all DC-local Prometheus servers. -- To view, visit https://gerrit.wikimedia.org/r/397727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2421f6c9236160438d43d929e9ea616aad00c3a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits