BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/346980 )

Change subject: dnsrecursor: update to backports for transition
......................................................................


dnsrecursor: update to backports for transition

This is temporary to ensure smooth rollout on existing jessie
recdns machines.  Should revert after all are upgraded via puppet.

Change-Id: Id1876231c33e644f6f3f645c085574bf490907b2
---
M modules/dnsrecursor/manifests/init.pp
1 file changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/modules/dnsrecursor/manifests/init.pp 
b/modules/dnsrecursor/manifests/init.pp
index 935a6a9..3cce539 100644
--- a/modules/dnsrecursor/manifests/init.pp
+++ b/modules/dnsrecursor/manifests/init.pp
@@ -72,15 +72,23 @@
                 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/346980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1876231c33e644f6f3f645c085574bf490907b2
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to