Dzahn has uploaded a new change for review. ( 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, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/397726/1 diff --git a/manifests/site.pp b/manifests/site.pp index 10d8be1..c83870c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -738,9 +738,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. @@ -748,9 +745,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..da3b17f 100644 --- a/modules/role/manifests/druid/analytics/worker.pp +++ b/modules/role/manifests/druid/analytics/worker.pp @@ -8,6 +8,7 @@ description => "Druid worker in the analytics-${::site} cluster", } + 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..18c5bd5 100644 --- a/modules/role/manifests/druid/public/worker.pp +++ b/modules/role/manifests/druid/public/worker.pp @@ -8,6 +8,7 @@ class { '::lvs::realserver': } + 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: newchange Gerrit-Change-Id: I980010842b69e5d848dff6d989fdd30c63737217 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
