[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "authdns: move hiera() down into module"

[BBlack (Code Review)]

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

Change subject: Revert "authdns: move hiera() down into module"
......................................................................


Revert "authdns: move hiera() down into module"

This reverts commit 80103e91445d5811842de9358f84ffce96d2fbe8.

Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
---
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
4 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 29a137f..675c655 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -20,9 +20,6 @@
 ) {
     require ::authdns::scripts
 
-    $lvs_services = hiera('lvs::configuration::lvs_services')
-    $discovery_services = hiera('discovery::services')
-
     if $gitrepo {
         require ::geoip::data::puppet
         $svc_ensure = 'running'
diff --git a/modules/authdns/manifests/ns.pp b/modules/authdns/manifests/ns.pp
index f52d47f..b541921 100644
--- a/modules/authdns/manifests/ns.pp
+++ b/modules/authdns/manifests/ns.pp
@@ -6,10 +6,9 @@
     $gitrepo = undef,
     $monitoring = true,
     $conftool_prefix = hiera('conftool_prefix'),
+    $lvs_services,
+    $discovery_services,
 ) {
-    $lvs_services = hiera('lvs::configuration::lvs_services')
-    $discovery_services = hiera('discovery::services')
-
     class { 'authdns':
         nameservers => $nameservers,
         gitrepo     => $gitrepo,
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index 7bfa0c7..f2893b0 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -14,8 +14,10 @@
     )
 
     class { 'authdns::ns':
-        nameservers => $role::authdns::data::nameservers,
-        gitrepo     => $role::authdns::data::gitrepo,
+        nameservers        => $role::authdns::data::nameservers,
+        gitrepo            => $role::authdns::data::gitrepo,
+        lvs_services       => hiera('lvs::configuration::lvs_services'),
+        discovery_services => hiera('discovery::services'),
     }
 
     ferm::service { 'udp_dns_auth':
diff --git a/modules/role/manifests/authdns/testns.pp 
b/modules/role/manifests/authdns/testns.pp
index a637e86..0d6f9d6 100644
--- a/modules/role/manifests/authdns/testns.pp
+++ b/modules/role/manifests/authdns/testns.pp
@@ -3,7 +3,9 @@
 class role::authdns::testns {
     include role::authdns::data
     class { 'authdns::ns':
-        gitrepo    => $role::authdns::data::gitrepo,
-        monitoring => false,
+        gitrepo            => $role::authdns::data::gitrepo,
+        monitoring         => false,
+        lvs_services       => hiera('lvs::configuration::lvs_services'),
+        discovery_services => hiera('discovery::services'),
     }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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