Yuvipanda has submitted this change and it was merged.

Change subject: Revert "puppet: Add option to use newer ENC"
......................................................................


Revert "puppet: Add option to use newer ENC"

Gerrit's UI is quite something. I rebased ps3 instead of ps4,
so an older version of the patch got merged.


This reverts commit 6aa23e96087981b0cf60879b01950647200ba7ce.

Change-Id: I3b78b1cb5e6b3cbfb81ad08d389b10a50eb77aed
---
M modules/puppet/manifests/self/config.pp
1 file changed, 12 insertions(+), 33 deletions(-)

Approvals:
  Yuvipanda: Verified; 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 7c75fe0..33edbf4 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -18,45 +18,24 @@
     $puppet_client_subnet = undef,
     $certname             = $::fqdn,
     $autosign             = hiera('puppetmaster::autosigner', false),
-    $use_enc              = false,
 ) {
-    if $use_enc {
-        require_package('python3-yaml', 'python3-ldap3')
+    include ldap::role::config::labs
 
-        include ldap::yamlcreds
+    $ldapconfig = $ldap::role::config::labs::ldapconfig
+    $basedn = $ldapconfig['basedn']
 
-        file { '/usr/local/bin/puppet-enc':
-            source => 'puppet:///modules/role/labs/puppet-enc.py',
-            mode   => '0555',
-            owner  => 'root',
-            group  => 'root',
-        }
 
-        $encconfig = {
-            'node_terminus'  => 'exec',
-            'external_nodes' => '/usr/local/bin/puppet-enc',
-        }
-    } else {
-        include ldap::role::config::labs
-
-        $ldapconfig = $ldap::role::config::labs::ldapconfig
-        $basedn = $ldapconfig['basedn']
-
-        $encconfig = {
-            'node_terminus' => 'ldap',
-            'ldapserver'    => $ldapconfig['servernames'][0],
-            'ldapbase'      => "ou=hosts,${basedn}",
-            'ldapstring'    => 
'(&(objectclass=puppetClient)(associatedDomain=%s))',
-            'ldapuser'      => $ldapconfig['proxyagent'],
-            'ldappassword'  => $ldapconfig['proxypass'],
-            'ldaptls'       => true,
-        }
-    }
-
-    $config = merge($encconfig, {
+    $config = {
+        'node_terminus' => 'ldap',
+        'ldapserver'    => $ldapconfig['servernames'][0],
+        'ldapbase'      => "ou=hosts,${basedn}",
+        'ldapstring'    => 
'(&(objectclass=puppetClient)(associatedDomain=%s))',
+        'ldapuser'      => $ldapconfig['proxyagent'],
+        'ldappassword'  => $ldapconfig['proxypass'],
+        'ldaptls'       => true,
         'dbadapter'     => 'sqlite3',
         'autosign'      => $autosign
-    })
+    }
 
 
     # This is set to something different than the default

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b78b1cb5e6b3cbfb81ad08d389b10a50eb77aed
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

Reply via email to