Yuvipanda has submitted this change and it was merged.
Change subject: docker: Start the docker service by default
......................................................................
docker: Start the docker service by default
Change-Id: I48cd4087fa78f83fa52f3ed2d9ea4461f2593d80
---
M modules/docker/manifests/engine.pp
M modules/k8s/manifests/docker.pp
2 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/docker/manifests/engine.pp
b/modules/docker/manifests/engine.pp
index c3f047b..b9823cd 100644
--- a/modules/docker/manifests/engine.pp
+++ b/modules/docker/manifests/engine.pp
@@ -1,5 +1,6 @@
class docker::engine(
$version = '1.9.1-0~jessie',
+ $declare_service = true,
) {
apt::repository { 'docker':
uri => 'https://apt.dockerproject.org/repo',
@@ -45,4 +46,11 @@
notify => Service['docker'],
require => File['/root/.docker'],
}
+
+ if $declare_service {
+ service { 'docker':
+ ensure => running,
+ subscribe => Package['docker-engine'],
+ }
+ }
}
diff --git a/modules/k8s/manifests/docker.pp b/modules/k8s/manifests/docker.pp
index 2748023..f21bfa8 100644
--- a/modules/k8s/manifests/docker.pp
+++ b/modules/k8s/manifests/docker.pp
@@ -2,7 +2,9 @@
#
# Sets up docker as used by kubernetes
class k8s::docker {
- class { '::docker::engine': }
+ class { '::docker::engine':
+ declare_service => false,
+ }
base::service_unit { 'docker':
systemd => true,
--
To view, visit https://gerrit.wikimedia.org/r/279019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48cd4087fa78f83fa52f3ed2d9ea4461f2593d80
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
