Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315294
Change subject: docker::engine: remove execs, transform to pure-puppet
......................................................................
docker::engine: remove execs, transform to pure-puppet
Change-Id: I51709268433ae0bf047652f5743a61c70b606b78
---
M modules/docker/manifests/engine.pp
1 file changed, 24 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/315294/1
diff --git a/modules/docker/manifests/engine.pp
b/modules/docker/manifests/engine.pp
index 12b2674..94533a2 100644
--- a/modules/docker/manifests/engine.pp
+++ b/modules/docker/manifests/engine.pp
@@ -1,6 +1,8 @@
class docker::engine(
$version = '1.11.2-0~jessie',
$declare_service = true,
+ $vg_to_remove = 'vd',
+ $physical_volumes = ['/dev/vda4'],
) {
apt::repository { 'docker':
uri => 'https://apt.dockerproject.org/repo',
@@ -10,22 +12,30 @@
keyfile => 'puppet:///modules/docker/docker.gpg',
}
- file { '/usr/local/bin/setup-docker':
- source => 'puppet:///modules/docker/setup-docker',
- owner => 'root',
- group => 'root',
- mode => '0554',
+ volume_group { $vg_to_remove:
+ ensure => absent,
+ physical_volumes => [],
}
- exec { 'setup-docker':
- command => "/usr/local/bin/setup-docker ${version}",
- unless => '/sbin/vgdisplay docker',
- user => 'root',
- group => 'root',
- require => [
- Apt::Repository['docker'],
- File['/usr/local/bin/setup-docker']
- ]
+ volume_group { 'docker':
+ ensure => present,
+ physical_volumes => $physical_volumes,
+ require => Volume_group[$vg_to_remove],
+ }
+
+ logical_volume { 'data':
+ volume_group => 'docker',
+ extents => '95%VG',
+ }
+
+ logical_volume { 'metadata':
+ volume_group => 'docker',
+ extents => '5%VG',
+ }
+
+ package { 'docker-engine':
+ ensure => $version,
+ require => Apt::Repository['docker']
}
if $declare_service {
--
To view, visit https://gerrit.wikimedia.org/r/315294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51709268433ae0bf047652f5743a61c70b606b78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
