Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397726 )

Change subject: druid: move firewall includes from site to roles
......................................................................


druid: move firewall includes from site to roles

Change-Id: I980010842b69e5d848dff6d989fdd30c63737217
---
M manifests/site.pp
M modules/role/manifests/druid/analytics/worker.pp
M modules/role/manifests/druid/public/worker.pp
3 files changed, 4 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index bb5c409..17519af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -662,9 +662,6 @@
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
 node /^druid100[123].eqiad.wmnet$/ {
     role(druid::analytics::worker)
-
-    include ::base::firewall
-    include ::standard
 }
 
 # Druid public-eqiad servers.
@@ -672,9 +669,6 @@
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
 node /^druid100[456].eqiad.wmnet$/ {
     role(druid::public::worker)
-
-    include ::base::firewall
-    include ::standard
 }
 
 # nfs server for dumps generation, also rsyncs
diff --git a/modules/role/manifests/druid/analytics/worker.pp 
b/modules/role/manifests/druid/analytics/worker.pp
index 9f03d55..7d5b613 100644
--- a/modules/role/manifests/druid/analytics/worker.pp
+++ b/modules/role/manifests/druid/analytics/worker.pp
@@ -8,6 +8,8 @@
         description => "Druid worker in the analytics-${::site} cluster",
     }
 
+    include ::standard
+    include ::profile::base::firewall
     include ::profile::druid::broker
     include ::profile::druid::coordinator
     include ::profile::druid::historical
diff --git a/modules/role/manifests/druid/public/worker.pp 
b/modules/role/manifests/druid/public/worker.pp
index b24226e..25f8bd5 100644
--- a/modules/role/manifests/druid/public/worker.pp
+++ b/modules/role/manifests/druid/public/worker.pp
@@ -8,6 +8,8 @@
 
     class { '::lvs::realserver': }
 
+    include ::standard
+    include ::profile::base::firewall
     include ::profile::druid::broker
     include ::profile::druid::coordinator
     include ::profile::druid::historical

-- 
To view, visit https://gerrit.wikimedia.org/r/397726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I980010842b69e5d848dff6d989fdd30c63737217
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to