Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: docker::registry: move hiera lookups to the role
......................................................................
docker::registry: move hiera lookups to the role
Change-Id: Iad46f27d72810d42b52dfa2215c2660e12bd320c
---
M modules/docker/manifests/registry.pp
M modules/role/manifests/toollabs/docker/registry.pp
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/docker/manifests/registry.pp
b/modules/docker/manifests/registry.pp
index da5dcd4..658fec6 100644
--- a/modules/docker/manifests/registry.pp
+++ b/modules/docker/manifests/registry.pp
@@ -2,6 +2,8 @@
$allow_push_from,
$ssl_certificate_name,
$ssl_settings,
+ $docker_username,
+ $docker_password_hash,
$storage_backend='filebackend',
$datapath='/srv/registry',
$swift_user=undef,
@@ -62,8 +64,6 @@
mode => '0555',
}
- $docker_username = hiera('docker::username')
- $docker_password_hash = hiera('docker::password_hash')
file { '/etc/docker/registry/htpasswd':
content => "${docker_username}:${docker_password_hash}",
owner => 'www-data',
diff --git a/modules/role/manifests/toollabs/docker/registry.pp
b/modules/role/manifests/toollabs/docker/registry.pp
index 231a784..43ec634 100644
--- a/modules/role/manifests/toollabs/docker/registry.pp
+++ b/modules/role/manifests/toollabs/docker/registry.pp
@@ -9,8 +9,13 @@
$builder = ipresolve(hiera('docker::builder_host'), 4, $::nameservers[0])
+ $user = hiera('docker::username')
+ $hash = hiera('docker::password_hash')
+
class { '::docker::registry':
- backend => 'filebackend',
+ docker_username => $user,
+ docker_password_hash => $hash,
+ storage_backend => 'filebackend',
datapath => '/srv/registry',
allow_push_from => $builder,
ssl_certificate_name => 'star.tools.wmflabs.org',
--
To view, visit https://gerrit.wikimedia.org/r/318057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad46f27d72810d42b52dfa2215c2660e12bd320c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
