Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: base::resolving: allow defining additional search domains in 
labs
......................................................................


base::resolving: allow defining additional search domains in labs

Change-Id: I961da404e12fdd21eb1f5841f53b6fb0f52a9e98
---
M modules/base/manifests/resolving.pp
M modules/base/templates/resolv.conf.labs.erb
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/base/manifests/resolving.pp 
b/modules/base/manifests/resolving.pp
index 117158b..2228713 100644
--- a/modules/base/manifests/resolving.pp
+++ b/modules/base/manifests/resolving.pp
@@ -1,5 +1,6 @@
 class base::resolving (
     $domain_search = $::domain,
+    $labs_additional_domains = [],
 ){
     if ! $::nameservers {
         error("Variable ${::nameservers} is not defined!")
diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index ae8ae8d..bffda75 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -4,7 +4,7 @@
 ## from:   base::resolving
 
 domain <%= @labsproject %>.<%= @site %>.<%= @labs_tld %>
-search <%= @labsproject %>.<%= @site %>.<%= @labs_tld %> <%= @site %>.<%= 
@labs_tld %>
+search <%= @labsproject %>.<%= @site %>.<%= @labs_tld %> <%= @site %>.<%= 
@labs_tld %> <%= @labs_additional_domains.join(' ') %>
 <% scope.lookupvar('::nameservers').each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I961da404e12fdd21eb1f5841f53b6fb0f52a9e98
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@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

Reply via email to