Muehlenhoff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386395 )

Change subject: Use thirdparty/k8s repository in docker class
......................................................................

Use thirdparty/k8s repository in docker class

Starting with stretch the thirdparty repository is split into logical
chunks.

Change-Id: I3757ed578e7d2e444a5c44cff3228b04e602fe28
---
M modules/docker/manifests/init.pp
1 file changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/386395/1

diff --git a/modules/docker/manifests/init.pp b/modules/docker/manifests/init.pp
index 5a708b1..be4f997 100644
--- a/modules/docker/manifests/init.pp
+++ b/modules/docker/manifests/init.pp
@@ -15,7 +15,21 @@
     $version,
     $package_name='docker-engine',
 ){
-    package { $package_name:
-        ensure => $version,
+
+    if os_version('debian >= stretch') {
+        apt::repository { 'thirdparty-k8s':
+            uri        => 'http://apt.wikimedia.org/wikimedia',
+            dist       => "${::lsbdistcodename}-wikimedia",
+            components => 'thirdparty/k8s',
+        }
+
+        package { $package_name:
+            ensure => $version,
+            require => [ Apt::Repository['thirdparty-k8s'], Exec['apt-get 
update']],
+        }
+    } else {
+        package { $package_name:
+            ensure => $version,
+        }
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3757ed578e7d2e444a5c44cff3228b04e602fe28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>

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

Reply via email to