Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: etcd::ssl: fix puppet ssldir path
......................................................................


etcd::ssl: fix puppet ssldir path

Use the function that was already made for this purpose

Bug: T144703
Change-Id: I8555bf6506273a37701549b343ede6ca008e9506
---
M modules/etcd/manifests/ssl.pp
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/etcd/manifests/ssl.pp b/modules/etcd/manifests/ssl.pp
index 179332f..dd04c26 100644
--- a/modules/etcd/manifests/ssl.pp
+++ b/modules/etcd/manifests/ssl.pp
@@ -8,14 +8,11 @@
 # [*puppet_cert_name*]
 #   The name on the puppet certificate.
 #
-# [*ssldir*]
-#   The directory where the puppet ssl certs are contained
-#
 class etcd::ssl(
     $puppet_cert_name = $::fqdn,
-    $ssldir           = '/var/lib/puppet/ssl',
     ) {
 
+    $ssldir = puppet_ssldir()
     $basedir = '/var/lib/etcd/ssl'
     $pubdir = "${basedir}/certs"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/309929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8555bf6506273a37701549b343ede6ca008e9506
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to