BBlack has submitted this change and it was merged.
Change subject: switch zerofetcher auth to secret()
......................................................................
switch zerofetcher auth to secret()
Change-Id: Ib4d9d5ce230b0136fa4a95130bacc6ff355683df
---
M modules/role/manifests/cache/mobile.pp
M modules/varnish/manifests/zero_update.pp
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index 6f24b15..eda4858 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -64,8 +64,8 @@
}
class { 'varnish::zero_update':
- site => $zero_site,
- auth_src => 'puppet:///private/misc/zerofetcher.auth',
+ site => $zero_site,
+ auth_content => secret('misc/zerofetcher.auth'),
}
$runtime_param = $::site ? {
diff --git a/modules/varnish/manifests/zero_update.pp
b/modules/varnish/manifests/zero_update.pp
index bc4b6b7..f5b4f14 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -23,7 +23,7 @@
}
# Zero-specific update stuff
-class varnish::zero_update($site, $auth_src, $hour = '*', $minute = '*/5') {
+class varnish::zero_update($site, $auth_content, $hour = '*', $minute = '*/5')
{
require 'varnish::netmapper_update_common'
package { 'python-requests': ensure => installed; }
@@ -47,7 +47,7 @@
owner => 'netmap',
group => 'netmap',
mode => '0400',
- source => $auth_src,
+ content => $auth_content,
require => [File["/etc/zerofetcher"]],
}
--
To view, visit https://gerrit.wikimedia.org/r/227226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d9d5ce230b0136fa4a95130bacc6ff355683df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
