Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274179
Change subject: labs: Revert all work around CNAMEs for toollabs
......................................................................
labs: Revert all work around CNAMEs for toollabs
It turns out that if you setup a zonefile for a particular
zone, the recursor doesn't reach out to the other backends.
This causes empty responses to DNS requests for *.tools.eqiad.wmflabs,
which is... bad!
This is obvious in retrospect.
Bug: T118758
Change-Id: I7ac66f3d8260eef4ed89637e03d6d3dfaadf959f
---
D hieradata/role/common/labs/dnsrecursor.yaml
M modules/role/manifests/labs/dnsrecursor.pp
D modules/toollabs/manifests/cnames.pp
D modules/toollabs/templates/cnames.erb
4 files changed, 0 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/274179/1
diff --git a/hieradata/role/common/labs/dnsrecursor.yaml
b/hieradata/role/common/labs/dnsrecursor.yaml
deleted file mode 100644
index aaeb6ef..0000000
--- a/hieradata/role/common/labs/dnsrecursor.yaml
+++ /dev/null
@@ -1 +0,0 @@
-toollabs::cnames::docker_registry: tools-docker-registry-01.tools.eqiad.wmflabs
diff --git a/modules/role/manifests/labs/dnsrecursor.pp
b/modules/role/manifests/labs/dnsrecursor.pp
index 65470c8..2cfe3ac 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -310,11 +310,6 @@
require => File['/var/zones']
}
- class {'::toollabs::cnames':
- require => File['/var/zones'],
- notify => Service['pdns-recursor'],
- }
-
::dnsrecursor::monitor { $listen_addresses: }
ferm::service { 'recursor_udp_dns_rec':
diff --git a/modules/toollabs/manifests/cnames.pp
b/modules/toollabs/manifests/cnames.pp
deleted file mode 100644
index c5f7af7..0000000
--- a/modules/toollabs/manifests/cnames.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# = Class: toollabs::cnames
-# Various CNAMEs used by tool labs
-# Used in the labs dnsrecursor role. Hiera for this will need to be hence set
-# in ops/puppet rather than wikitech.
-class toollabs::cnames(
- $docker_registry,
-) {
- file { '/var/zones/tools.eqiad.wmflabs':
- ensure => present,
- owner => 'root',
- group => 'root',
- content => template('toollabs/cnames.erb')
- }
-}
diff --git a/modules/toollabs/templates/cnames.erb
b/modules/toollabs/templates/cnames.erb
deleted file mode 100644
index a140252..0000000
--- a/modules/toollabs/templates/cnames.erb
+++ /dev/null
@@ -1 +0,0 @@
-tools-docker-registry 300 IN CNAME <%= @docker_registry %>.
--
To view, visit https://gerrit.wikimedia.org/r/274179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ac66f3d8260eef4ed89637e03d6d3dfaadf959f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
