Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386395 )

Change subject: Use thirdparty/k8s repository for profile::docker::engine
......................................................................


Use thirdparty/k8s repository for profile::docker::engine

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

Change-Id: I3757ed578e7d2e444a5c44cff3228b04e602fe28
---
M modules/profile/manifests/docker/engine.pp
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/profile/manifests/docker/engine.pp 
b/modules/profile/manifests/docker/engine.pp
index 543ea8a..2169d67 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -14,6 +14,15 @@
     $declare_service = hiera('profile::docker::engine::declare_service')
 ) {
 
+    if os_version('debian >= stretch') {
+        apt::repository { 'thirdparty-k8s':
+            uri        => 'http://apt.wikimedia.org/wikimedia',
+            dist       => "${::lsbdistcodename}-wikimedia",
+            components => 'thirdparty/k8s',
+            before     => Class['docker'],
+        }
+    }
+
     # Install docker
     class { '::docker':
         version => $version,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3757ed578e7d2e444a5c44cff3228b04e602fe28
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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