Merge lp:~brad-marshall/charms/trusty/nagios/fix-pagerduty-cron into lp:charms/trusty/nagios

[Brad Marshall]

Added passing of the pagerduty queue dir to the cronjob.

[Stuart Bishop (stub)]

Looks good to me.

review: Approve

=== renamed file 'files/nagios-pagerduty-flush-cron' => 'hooks/templates/nagios-pagerduty-flush-cron.tmpl'
--- files/nagios-pagerduty-flush-cron	2015-07-22 03:31:36 +0000
+++ hooks/templates/nagios-pagerduty-flush-cron.tmpl	2015-10-12 00:58:21 +0000
@@ -4,4 +4,5 @@
 
 # Flush the nagios pagerduty alerts every minute as per
 # http://www.pagerduty.com/docs/guides/nagios-perl-integration-guide/
-* * * * *   nagios  /usr/local/bin/pagerduty_nagios.pl flush
+* * * * *   nagios  /usr/local/bin/pagerduty_nagios.pl flush --queue-dir {{ pagerduty_path }}
+
 
=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2015-10-08 18:40:52 +0000
+++ hooks/upgrade-charm	2015-10-12 00:58:21 +0000
@@ -123,8 +123,12 @@
         with open(pagerduty_cfg, 'w') as f:
             f.write(t.render(template_values))
 
-        # Ship the cron file
-        shutil.copyfile('files/nagios-pagerduty-flush-cron', pagerduty_cron)
+        with open('hooks/templates/nagios-pagerduty-flush-cron.tmpl', 'r') as f2:
+            templateDef = f2.read()
+
+        t2 = Template(templateDef)
+        with open(pagerduty_cron, 'w') as f2:
+            f2.write(t2.render(template_values))
 
         # Ship the pagerduty_nagios.pl script
         shutil.copyfile('files/pagerduty_nagios.pl', '/usr/local/bin/pagerduty_nagios.pl')