Gehel has submitted this change and it was merged.
Change subject: Puppet SSL dir is not the same on Production or Labs
......................................................................
Puppet SSL dir is not the same on Production or Labs
The `puppet_ssldir` function seems to take care of this difference.
Bug: T124444
Change-Id: Ie8186fded68940ce4b164b38a241ec3939adc02e
---
M modules/base/manifests/expose_puppet_certs.pp
M modules/elasticsearch/manifests/https.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Gehel: Looks good to me, approved
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/base/manifests/expose_puppet_certs.pp
b/modules/base/manifests/expose_puppet_certs.pp
index cedc88c..c95b7c5 100644
--- a/modules/base/manifests/expose_puppet_certs.pp
+++ b/modules/base/manifests/expose_puppet_certs.pp
@@ -27,7 +27,7 @@
$provide_private = false,
$user = 'root',
$group = 'root',
- $ssldir = '/var/lib/puppet/ssl',
+ $ssldir = puppet_ssldir(),
) {
validate_absolute_path($ssldir)
diff --git a/modules/elasticsearch/manifests/https.pp
b/modules/elasticsearch/manifests/https.pp
index b9220c2..85260af 100644
--- a/modules/elasticsearch/manifests/https.pp
+++ b/modules/elasticsearch/manifests/https.pp
@@ -15,7 +15,6 @@
::base::expose_puppet_certs { '/etc/nginx':
ensure => $ensure,
provide_private => true,
- ssldir => '/var/lib/puppet/client/ssl',
}
::nginx::site { 'elasticsearch-ssl-termination':
--
To view, visit https://gerrit.wikimedia.org/r/277329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8186fded68940ce4b164b38a241ec3939adc02e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
