[MediaWiki-commits] [Gerrit] Remove some uses of scope.lookupvar by passing args more exp... - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Remove some uses of scope.lookupvar by passing args more 
explicitly.
......................................................................

Remove some uses of scope.lookupvar by passing args more explicitly.

Change-Id: If4d1612a7b291e0f4fdaa43c3703efb7fee90588
---
M modules/puppetmaster/manifests/config.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/templates/fileserver.conf.erb
M modules/puppetmaster/templates/master.conf.erb
4 files changed, 12 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/220489/1

diff --git a/modules/puppetmaster/manifests/config.pp 
b/modules/puppetmaster/manifests/config.pp
index 001988e..46e0ffa 100644
--- a/modules/puppetmaster/manifests/config.pp
+++ b/modules/puppetmaster/manifests/config.pp
@@ -2,7 +2,11 @@
 #
 # This class handles the master part of /etc/puppet.conf.
 # Do not include directly.
-class puppetmaster::config {
+class puppetmaster::config(
+           $config,
+           $server_type,
+) {
+
     base::puppet::config { 'master':
         prio    => 20,
         content => template('puppetmaster/master.conf.erb'),
diff --git a/modules/puppetmaster/manifests/init.pp 
b/modules/puppetmaster/manifests/init.pp
index c246cb4..95a40e2 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -42,7 +42,10 @@
 
     # Require /etc/puppet.conf to be in place,
     # so the postinst scripts do the right things.
-    require puppetmaster::config
+    class { 'puppetmaster::config':
+        config      => $config,
+        server_type => $server_type,
+    }
 
     package { [
         'puppetmaster',
diff --git a/modules/puppetmaster/templates/fileserver.conf.erb 
b/modules/puppetmaster/templates/fileserver.conf.erb
index 60441ac..40f044d 100644
--- a/modules/puppetmaster/templates/fileserver.conf.erb
+++ b/modules/puppetmaster/templates/fileserver.conf.erb
@@ -8,14 +8,14 @@
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]
-    path <%= scope.lookupvar('puppetmaster::config').fetch('filesdir', 
"/etc/puppet/files") %>
+    path <%= @config.fetch('filesdir', "/etc/puppet/files") %>
     allow *
 
 [plugins]
     allow *
 
 [private]
-    path <%= scope.lookupvar('puppetmaster::config').fetch('privatefilesdir', 
"/etc/puppet/private/files") %>
+    path <%= @config.fetch('privatefilesdir', "/etc/puppet/private/files") %>
     allow *
 
 [facts]
diff --git a/modules/puppetmaster/templates/master.conf.erb 
b/modules/puppetmaster/templates/master.conf.erb
index 77a9c88..72e2cbd 100644
--- a/modules/puppetmaster/templates/master.conf.erb
+++ b/modules/puppetmaster/templates/master.conf.erb
@@ -5,7 +5,7 @@
 modulepath = /etc/puppet/private/modules:/etc/puppet/modules
 
 # puppetmaster($config) settings
-<% scope.lookupvar('puppetmaster::config').sort.each do |setting, value| -%>
+<% @config.sort.each do |setting, value| -%>
 <%= setting %> = <%= value %>
 <% end -%>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4d1612a7b291e0f4fdaa43c3703efb7fee90588
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>

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