Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325046
Change subject: Puppet: refactor puppet-enc include
......................................................................
Puppet: refactor puppet-enc include
puppet-enc is also required for puppet_compiler in labs, hence
factoring out the two existing inclusions into a seperate class.
Moved puppet-enc.py from role/files to puppet/files.
Change-Id: I29d03de76ec76872becb786a2c063c8dc18c0b04
---
R modules/puppet/files/puppet-enc.py
A modules/puppet/manifests/enc.pp
M modules/puppet/manifests/self/config.pp
M modules/role/manifests/puppetmaster/standalone.pp
4 files changed, 38 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/325046/1
diff --git a/modules/role/files/labs/puppet-enc.py
b/modules/puppet/files/puppet-enc.py
similarity index 100%
rename from modules/role/files/labs/puppet-enc.py
rename to modules/puppet/files/puppet-enc.py
diff --git a/modules/puppet/manifests/enc.pp b/modules/puppet/manifests/enc.pp
new file mode 100644
index 0000000..22f3b55
--- /dev/null
+++ b/modules/puppet/manifests/enc.pp
@@ -0,0 +1,34 @@
+# == Class puppet::enc
+# Sets up puppet-enc for labs use.
+# Used for self puppetmasters and puppet_compiler.
+#
+# == Parameters
+# None.
+#
+class puppet::enc(
+) {
+ require_package('python3-yaml', 'python3-ldap3')
+
+ include ldap::yamlcreds
+
+ file { '/etc/puppet-enc.yaml':
+ content => ordered_yaml({
+ host => hiera('labs_puppet_master'),
+ }),
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ }
+
+ file { '/usr/local/bin/puppet-enc':
+ source => 'puppet:///modules/puppet/puppet-enc.py',
+ mode => '0555',
+ owner => 'root',
+ group => 'root',
+ }
+
+ $config = {
+ 'node_terminus' => 'exec',
+ 'external_nodes' => '/usr/local/bin/puppet-enc',
+ }
+}
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index 84a5382..5a9567a 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -24,30 +24,9 @@
fail('Self hosted puppetmasters on Ubuntu precise no longer supported')
}
if $use_enc {
- require_package('python3-yaml', 'python3-ldap3')
+ include puppet::enc
- include ldap::yamlcreds
-
- file { '/etc/puppet-enc.yaml':
- content => ordered_yaml({
- host => hiera('labs_puppet_master'),
- }),
- mode => '0444',
- owner => 'root',
- group => 'root',
- }
-
- 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',
- }
+ $encconfig = $puppet::enc::config
} else {
include ldap::role::config::labs
diff --git a/modules/role/manifests/puppetmaster/standalone.pp
b/modules/role/manifests/puppetmaster/standalone.pp
index 2df3b55..c5da61e 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -49,31 +49,8 @@
$basedn = $ldapconfig['basedn']
if $use_enc {
- # Setup ENC
- require_package('python3-yaml', 'python3-ldap3')
-
- include ldap::yamlcreds
-
- file { '/etc/puppet-enc.yaml':
- content => ordered_yaml({
- host => hiera('labs_puppet_master'),
- }),
- mode => '0444',
- owner => 'root',
- group => 'root',
- }
-
- 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',
- }
+ include puppet::enc
+ $encconfig = $puppet::enc::config
} else {
$encconfig = {
'ldapserver' => $ldapconfig['servernames'][0],
--
To view, visit https://gerrit.wikimedia.org/r/325046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29d03de76ec76872becb786a2c063c8dc18c0b04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
