Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344050 )
Change subject: Gerrit: Make $host required, rather than optional then failing
......................................................................
Gerrit: Make $host required, rather than optional then failing
DWIM, etc.
Add trailing comma to slave detection while I'm here
Change-Id: Ie39dc5965133d6d926c5573d92d930d55e8e052b
---
M modules/gerrit/manifests/init.pp
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 385640c..167639e 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,16 +1,12 @@
# Manifest to setup a Gerrit instance
class gerrit(
- $host = undef,
+ $host,
$master_host = $::fqdn,
) {
- if $host == undef {
- fail('$gerrit::host must be set!')
- }
-
$slave = $master_host ? {
$::fqdn => false,
- default => true
+ default => true,
}
class { '::gerrit::jetty':
--
To view, visit https://gerrit.wikimedia.org/r/344050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie39dc5965133d6d926c5573d92d930d55e8e052b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
