Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315883

Change subject: url_downloader: move standard/firewall to role
......................................................................

url_downloader: move standard/firewall to role

Move the includes of "standard" and "base::firewall"
from node level into the role. Simplify site.pp

Change-Id: I09f6992fe3a8a69c7f9e37c03ebb09b69ca669b6
---
M manifests/role/url_downloader.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/315883/1

diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index 76f8f00..75ffa54 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -26,6 +26,8 @@
         description => 'Upload-by-URL proxy'
     }
     include network::constants
+    include standard
+    include base::firewall
 
     $url_downloader_ip = hiera('url_downloader_ip', $::ipaddress)
     $url_downloader_port = hiera('url_downloader_port', 8080)
diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..750a107 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -25,8 +25,6 @@
 # url-downloaders
 node /^(alsafi|aluminium)\.wikimedia\.org$/ {
     role(url_downloader)
-    include standard
-    include base::firewall
 
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09f6992fe3a8a69c7f9e37c03ebb09b69ca669b6
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

Reply via email to