Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367891 )
Change subject: apache::conf: convert to use validate_numeric
......................................................................
apache::conf: convert to use validate_numeric
Bug: T171704
Change-Id: Ib2190fb3344a66150f4c1847b29a71f59a65af13
---
M modules/apache/manifests/conf.pp
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apache/manifests/conf.pp b/modules/apache/manifests/conf.pp
index 9346dcf..110ed21 100644
--- a/modules/apache/manifests/conf.pp
+++ b/modules/apache/manifests/conf.pp
@@ -53,10 +53,8 @@
include ::apache
validate_ensure($ensure)
-
- if $priority !~ /^\d?\d$/ {
- fail('"priority" must be between 0 - 99')
- }
+ # TODO/puppet4 make this a parameter type check
+ validate_numeric($priority, 99, 0)
if !($conf_type in $::apache::conf_types) {
fail("invalid conf_type '${conf_type}'")
--
To view, visit https://gerrit.wikimedia.org/r/367891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2190fb3344a66150f4c1847b29a71f59a65af13
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
