BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347554 )
Change subject: Revert "dnsrecursor: update to backports for transition"
......................................................................
Revert "dnsrecursor: update to backports for transition"
This reverts commit c4881821c4eaf92a064c5132f090183f4d3d7937.
Change-Id: I85dfb0655d2ccd555516538d09763f6dd8583e8a
---
M modules/dnsrecursor/manifests/init.pp
1 file changed, 4 insertions(+), 12 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/dnsrecursor/manifests/init.pp
b/modules/dnsrecursor/manifests/init.pp
index 3cce539..935a6a9 100644
--- a/modules/dnsrecursor/manifests/init.pp
+++ b/modules/dnsrecursor/manifests/init.pp
@@ -72,23 +72,15 @@
priority => '1001',
before => Package['pdns-recursor'],
}
-
- package { 'pdns-recursor':
- ensure => 'latest', # temporary during transition!
- }
- }
- else {
- package { 'pdns-recursor':
- ensure => 'present',
- }
}
}
else {
# trusty instances (labservices metaldns stuff)
$pdns_rec_ver = '3'
- package { 'pdns-recursor':
- ensure => 'present',
- }
+ }
+
+ package { 'pdns-recursor':
+ ensure => 'present',
}
file { '/etc/powerdns/recursor.conf':
--
To view, visit https://gerrit.wikimedia.org/r/347554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85dfb0655d2ccd555516538d09763f6dd8583e8a
Gerrit-PatchSet: 2
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
