Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: docker::registry: allow passing configurations
......................................................................
docker::registry: allow passing configurations
Change-Id: I04063f7ad6e409e3c2fa03a9f8a3ea3d746ed928
---
M modules/docker/manifests/registry.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/docker/manifests/registry.pp
b/modules/docker/manifests/registry.pp
index 5ee002f..f995fac 100644
--- a/modules/docker/manifests/registry.pp
+++ b/modules/docker/manifests/registry.pp
@@ -1,4 +1,5 @@
class docker::registry(
+ $config={},
$storage_backend='filebackend',
$datapath='/srv/registry',
$swift_user=undef,
@@ -43,7 +44,7 @@
}
- $config = {
+ $base_config = {
'version' => '0.1',
'storage' => $storage_config,
'http' => {
@@ -61,7 +62,7 @@
file { '/etc/docker/registry/config.yml':
- content => ordered_yaml($config),
+ content => ordered_yaml(merge($config, $base_config)),
owner => 'docker-registry',
group => 'docker-registry',
mode => '0440',
--
To view, visit https://gerrit.wikimedia.org/r/318064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04063f7ad6e409e3c2fa03a9f8a3ea3d746ed928
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
