Yuvipanda has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335970 )
Change subject: tools: Fix puppet on docker builder hosts
......................................................................
tools: Fix puppet on docker builder hosts
Change-Id: Ifcb5469fd4d70cf6fa958472655a2d83ea0413e4
---
M modules/role/manifests/toollabs/docker/builder.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/toollabs/docker/builder.pp
b/modules/role/manifests/toollabs/docker/builder.pp
index c9bb1ad..5def64e 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -8,12 +8,13 @@
}
class { '::profile::docker::engine':
- settings => {
+ settings => {
'iptables' => false,
'ip-masq' => false,
},
- version => '1.12.6-0~debian-jessie',
- require => Class['::profile::docker::storage'],
+ version => '1.12.6-0~debian-jessie',
+ declare_service => true,
+ require => Class['::profile::docker::storage'],
}
class { '::toollabs::images': }
--
To view, visit https://gerrit.wikimedia.org/r/335970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcb5469fd4d70cf6fa958472655a2d83ea0413e4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
