Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: kubernetes: install the worker class on the kubernetes1001-4
......................................................................
kubernetes: install the worker class on the kubernetes1001-4
Change-Id: Ibb02783c03f7ae120cd837f6577e72a84fc37a09
---
M manifests/site.pp
A modules/docker/manifests/configuration.pp
M modules/docker/manifests/init.pp
M modules/profile/manifests/docker/engine.pp
4 files changed, 28 insertions(+), 9 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index af05162..9dbbbdd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1380,7 +1380,7 @@
}
node /kubernetes100[1-4].eqiad.wmnet/ {
-# role(kubernetes::worker)
+ role(kubernetes::worker)
include standard
}
diff --git a/modules/docker/manifests/configuration.pp
b/modules/docker/manifests/configuration.pp
new file mode 100644
index 0000000..4439c76
--- /dev/null
+++ b/modules/docker/manifests/configuration.pp
@@ -0,0 +1,21 @@
+# === Class docker::configuration
+#
+# sets up the daemon.json file for the docker daemon.
+#
+# === Parameters
+#
+# [*settings*] The settings of the docker daemon, as a hash
+#
+# [*location*] The path on the filesystem for the daemon.json file.
+# Defaults to /etc/docker/daemon.json
+#
+class docker::configuration($settings, $location='/etc/docker/daemon.json') {
+ require ::docker
+ file { $location:
+ ensure => present,
+ content => ordered_json($settings),
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
+ }
+}
diff --git a/modules/docker/manifests/init.pp b/modules/docker/manifests/init.pp
index 40a1477..c0926ba 100644
--- a/modules/docker/manifests/init.pp
+++ b/modules/docker/manifests/init.pp
@@ -47,8 +47,4 @@
package { $package:
ensure => $version,
}
-
- service { 'docker':
- ensure => running,
- }
}
diff --git a/modules/profile/manifests/docker/engine.pp
b/modules/profile/manifests/docker/engine.pp
index 224d2cb..8156569 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -16,13 +16,13 @@
$pool_metadata_size = hiera('profile::docker::engine::lvm_metadata_size',
undef)
# Version to install; the default is not to pick one.
$docker_version = hiera('profile::docker::engine::version', 'present')
- $apt_proxy_settings = hiera('profile::docker::engine::proxy', undef)
+ $apt_proxy = hiera('profile::docker::engine::proxy', undef)
$service_ensure = hiera('profile::docker::engine::service', 'running')
# Install docker
class { 'docker':
- version => $docker_version,
- proxy_settings => $apt_proxy_settings
+ version => $docker_version,
+ proxy => $apt_proxy,
}
# Storage
@@ -35,6 +35,8 @@
$basic_lv_params = {
extents => $lv_extents,
thinpool => true,
+ mounted => false,
+ createfs => false,
}
$lv_params = $pool_metadata_size ? {
@@ -79,7 +81,7 @@
# Docker config
- docker::config { 'thinpool':
+ class { 'docker::configuration':
settings => merge($docker_settings, $docker_storage_options),
}
--
To view, visit https://gerrit.wikimedia.org/r/317120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb02783c03f7ae120cd837f6577e72a84fc37a09
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[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
