Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/321485
Change subject: docker: apt repo before installing package
......................................................................
docker: apt repo before installing package
Change-Id: Iae0154d1ba2e7710ade677db91b1169b7d22af89
---
M modules/docker/manifests/init.pp
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/321485/1
diff --git a/modules/docker/manifests/init.pp b/modules/docker/manifests/init.pp
index c0926ba..3763ea0 100644
--- a/modules/docker/manifests/init.pp
+++ b/modules/docker/manifests/init.pp
@@ -14,12 +14,16 @@
#
class docker($version, $use_dockerproject=true, $proxy=undef){
if $use_dockerproject {
+ $package = 'docker-engine'
+ $absent_package = 'docker.io'
+
apt::repository { 'docker':
uri => 'https://apt.dockerproject.org/repo',
dist => 'debian-jessie',
components => 'main',
source => false,
keyfile => 'puppet:///modules/docker/docker.gpg',
+ before => Package[$package],
}
$proxy_ensure = $proxy ? {
@@ -32,9 +36,8 @@
priority => '80',
key => 'Acquire::http::Proxy::apt.dockerproject.org',
value => $proxy,
+ before => Package[$package],
}
- $package = 'docker-engine'
- $absent_package = 'docker.io'
}
else {
$package = 'docker.io'
--
To view, visit https://gerrit.wikimedia.org/r/321485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae0154d1ba2e7710ade677db91b1169b7d22af89
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
