Alexandros Kosiaris has submitted this change and it was merged.

Change subject: role::puppetmaster: allow searching hostnames across the fleet
......................................................................


role::puppetmaster: allow searching hostnames across the fleet

This is needed for ipresolve() to work correctly wherever someone used a
hostname instead of a fqdn.

Change-Id: I852200b1fc0ca3ba629bb73327e5075da03d10b5
---
M hieradata/role/common/puppetmaster/backend.yaml
M hieradata/role/common/puppetmaster/frontend.yaml
2 files changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/puppetmaster/backend.yaml 
b/hieradata/role/common/puppetmaster/backend.yaml
index 2fa8f32..fb0befd 100644
--- a/hieradata/role/common/puppetmaster/backend.yaml
+++ b/hieradata/role/common/puppetmaster/backend.yaml
@@ -3,3 +3,9 @@
     value: standard
 admin::groups:
   - gitpuppet
+base::resolving::domain_search:
+  - wikimedia.org
+  - eqiad.wmnet
+  - codfw.wmnet
+  - esams.wmnet
+  - ulsfo.wmnet
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml 
b/hieradata/role/common/puppetmaster/frontend.yaml
index 9c8cab5..18bedc2 100644
--- a/hieradata/role/common/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/puppetmaster/frontend.yaml
@@ -4,3 +4,12 @@
 admin::groups:
   - gitpuppet
   - datacenter-ops
+base::resolving::domain_search:
+  - wikimedia.org
+  - eqiad.wmnet
+  - codfw.wmnet
+  - esams.wmnet
+  - ulsfo.wmnet
+confd::monitor_files: false
+apache::logrotate::period: "daily"
+apache::logrotate::rotate: 7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I852200b1fc0ca3ba629bb73327e5075da03d10b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@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