Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393357 )
Change subject: role::puppetmaster::standalone: allow specification of
puppet_major_version
......................................................................
role::puppetmaster::standalone: allow specification of puppet_major_version
This is typically defined as a global but this class was ignoring it.
Change-Id: I80f6e9450c1230028175d0f0a39af831a6a21f35
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 11 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/puppetmaster/standalone.pp
b/modules/role/manifests/puppetmaster/standalone.pp
index a597266..2b89432 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -33,6 +33,9 @@
# Hostname for the puppetmaster. Defaults to fqdn. Is used for SSL
# certificates, virtualhost routing, etc
#
+# [*puppet_major_version*]
+# Distinguishes version of puppet software e.g. 3 or 4
+#
# filtertags: labs-common
class role::puppetmaster::standalone(
$autosign = false,
@@ -43,6 +46,7 @@
$server_name = $::fqdn,
$use_enc = true,
$labs_puppet_master = hiera('labs_puppet_master'),
+ $puppet_major_version = hiera('puppet_major_version', undef),
) {
if ! $use_enc {
fail('Ldap puppet node definitions are no longer supported. The
$use_enc param must be true.')
@@ -60,12 +64,13 @@
}
class { '::puppetmaster':
- server_name => $server_name,
- allow_from => $allow_from,
- secure_private => false,
- prevent_cherrypicks => $prevent_cherrypicks,
- extra_auth_rules => $extra_auth_rules,
- config => $config,
+ server_name => $server_name,
+ allow_from => $allow_from,
+ secure_private => false,
+ prevent_cherrypicks => $prevent_cherrypicks,
+ extra_auth_rules => $extra_auth_rules,
+ config => $config,
+ puppet_major_version => $puppet_major_version,
}
# Update git checkout
--
To view, visit https://gerrit.wikimedia.org/r/393357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80f6e9450c1230028175d0f0a39af831a6a21f35
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
