Merge lp:~paulgear/charms/precise/nrpe-external-master/fix-duplicate-rsync-entries into lp:charms/nrpe-external-master

[Paul Gear]

[Brad Marshall (brad-marshall)]

Looks good to me.

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11054-results

review: Needs Fixing (automated testing)

[lp:~paulgear/charms/precise/nrpe-external-master/fix-duplicate-rsync-entries]

40. By Paul Gear on 2015-02-27

Increase timeout to 30 minutes to allow Azure test to complete

[Adam Israel (aisrael)]

Hi Paul,

This looks good to me, too. +1

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2014-11-18 01:23:42 +0000
+++ hooks/install	2015-02-27 05:17:50 +0000
@@ -22,6 +22,6 @@
 export NAGIOS_MASTER=$(config-get nagios_master)
 cheetah fill --env --oext compiled templates/rsyncd.conf.tmpl
 mkdir -p /etc/rsync-juju.d
-cp templates/rsyncd.conf.compiled /etc/rsync-juju.d/010-nrpe-external-master
+cp templates/rsyncd.conf.compiled /etc/rsync-juju.d/010-nrpe-external-master.conf
 
 service rsync restart

=== modified file 'tests/99-autogen'
--- tests/99-autogen	2014-11-06 21:25:39 +0000
+++ tests/99-autogen	2015-02-27 05:17:50 +0000
@@ -18,7 +18,7 @@
         cls.deployment.expose('nagios')
 
         try:
-            cls.deployment.setup(timeout=900)
+            cls.deployment.setup(timeout=1800)
             cls.deployment.sentry.wait()
         except amulet.helpers.TimeoutError:
             amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")