Muehlenhoff has submitted this change and it was merged.

Change subject: Move the authdns servers to the role keyword
......................................................................


Move the authdns servers to the role keyword

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

Change-Id: I4851adbc81c2faa04ce079de5f9995cfb3e98164
---
M manifests/site.pp
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7f25114..9a5fa21 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -220,11 +220,12 @@
 }
 
 node 'baham.wikimedia.org' {
+    role authdns::server
+
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
     include standard
-    include role::authdns::server
 }
 
 # Bastion in Virginia
@@ -845,11 +846,12 @@
 }
 
 node 'eeden.wikimedia.org' {
+    role authdns::server
+
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
     include standard
-    include role::authdns::server
 }
 
 node 'einsteinium.eqiad.wmnet' {
@@ -2247,11 +2249,12 @@
 }
 
 node 'radon.wikimedia.org' {
+    role authdns::server
+
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
     include standard
-    include role::authdns::server
 }
 
 # Live Recent Changes WebSocket stream

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

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

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

Reply via email to