Yuvipanda has submitted this change and it was merged.
Change subject: puppet: Enable ENC on trusty nodes too
......................................................................
puppet: Enable ENC on trusty nodes too
I've listed all the self hosted trusty puppetmasters and
made sure they all have backports enabled (logged in SAL)
This also explicitly fails it on precise nodes. I've
notified the people running those too.
Bug: T91990
Change-Id: I7a1aeacf388a17a2440952e673697a28d97f6f66
---
M modules/puppet/manifests/self/config.pp
1 file changed, 4 insertions(+), 9 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index 4494c55..84a5382 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -18,17 +18,12 @@
$puppet_client_subnet = undef,
$certname = $::fqdn,
$autosign = hiera('puppetmaster::autosigner', false),
- $use_enc = undef,
+ $use_enc = true,
) {
- if $use_enc == undef {
- # We don't want this in precise, since
- # precise is deprecated and we can't use the
- # same libraries there
- $use_enc_real = os_version('debian >= jessie')
- } else {
- $use_enc_real = $use_enc
+ if os_version('ubuntu == precise') {
+ fail('Self hosted puppetmasters on Ubuntu precise no longer supported')
}
- if $use_enc_real {
+ if $use_enc {
require_package('python3-yaml', 'python3-ldap3')
include ldap::yamlcreds
--
To view, visit https://gerrit.wikimedia.org/r/312044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a1aeacf388a17a2440952e673697a28d97f6f66
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
