Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: nutcracker: add an additional guard on the master version
......................................................................
nutcracker: add an additional guard on the master version
Bug: T131749
Change-Id: I690e601871e56dd87e94dcd3dc844de2437c4b30
---
M modules/nutcracker/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/nutcracker/manifests/init.pp
b/modules/nutcracker/manifests/init.pp
index 0400ea9..18466c8 100644
--- a/modules/nutcracker/manifests/init.pp
+++ b/modules/nutcracker/manifests/init.pp
@@ -57,7 +57,11 @@
notify => Service['nutcracker'],
}
- if $ensure == 'present' and versioncmp($::puppetversion, '3.5') >= 0 {
+ if (
+ $ensure == 'present' and
+ versioncmp($::puppetversion, '3.5') >= 0 and
+ versioncmp($::serverversion, '3.5') >= 0
+ ) {
File['/etc/nutcracker/nutcracker.yml'] {
validate_cmd => '/usr/sbin/nutcracker --test-conf %',
}
--
To view, visit https://gerrit.wikimedia.org/r/291688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I690e601871e56dd87e94dcd3dc844de2437c4b30
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
