Ottomata has submitted this change and it was merged.
Change subject: Use ca_cert for etcd client in eventlogging processor
......................................................................
Use ca_cert for etcd client in eventlogging processor
Bug: T112688
Change-Id: I01e285a2065083857d68c3163f56d7746b34e938
---
M manifests/role/eventlogging.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 5db86b1..10e43a8 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -160,9 +160,7 @@
mode => '0644',
source => '/var/lib/puppet/ssl/certs/ca.pem',
}
-
- #TODO: should the url be properly encoded?
- $etcd_uri = "https://${etcd_hosts}?cert=/etc/eventlogging.d/ssl/ca.pem";
+ $etcd_uri = "https://${etcd_hosts}?ca_cert=/etc/eventlogging.d/ssl/ca.pem";
eventlogging::service::processor { 'server-side-0':
format => '%{seqId}d EventLogging %j',
--
To view, visit https://gerrit.wikimedia.org/r/242270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01e285a2065083857d68c3163f56d7746b34e938
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
