Dzahn has submitted this change and it was merged.

Change subject: tor: Use the role keyword
......................................................................


tor: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: I75b115a1780b3849595d1723ff65cece25373808
---
M manifests/site.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 02bed8b..295a5a1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2266,9 +2266,10 @@
 
 # Tor relay
 node 'radium.wikimedia.org' {
+    role tor
+
     include base::firewall
     include standard
-    include role::tor
 
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75b115a1780b3849595d1723ff65cece25373808
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to