Ori.livneh has submitted this change and it was merged.

Change subject: Restore generic::upstart_job parameters
......................................................................


Restore generic::upstart_job parameters

The lint of the 'generic' module caused the parameters passed to
generic::upstart_job() to be checked as boolean instead of the string as
they used to be.

The parent call have not been updated and are still passing the boolean
as string which cause the condition to never be matched.

This patch let the define to recognize string and boolean values.

Regression introduced by: 4887dc90
  https://gerrit.wikimedia.org/r/#/c/107037/

Change-Id: I03363419c238b696f83b636dc84a79e6a95436d1
---
M modules/generic/manifests/upstart_job.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/generic/manifests/upstart_job.pp 
b/modules/generic/manifests/upstart_job.pp
index cd20c4c..1184987 100644
--- a/modules/generic/manifests/upstart_job.pp
+++ b/modules/generic/manifests/upstart_job.pp
@@ -8,7 +8,7 @@
         target  => '/lib/init/upstart-job',
     }
 
-    if $install == true {
+    if $install == true or $install == 'true' {
         file { "/etc/init/${title}.conf":
             owner    => 'root',
             group   => 'root',
@@ -17,7 +17,7 @@
         }
     }
 
-    if $start == true {
+    if $start == true or $start == 'true' {
         exec { "start ${title}":
             require     => File["/etc/init/${title}.conf"],
             subscribe   => File["/etc/init/${title}.conf"],

-- 
To view, visit https://gerrit.wikimedia.org/r/118714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I03363419c238b696f83b636dc84a79e6a95436d1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Guido.iaquinti <guido.iaqui...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to