From f4a0bc53677f6605a087e07be31c7969f46d7e53 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 6 Dec 2013 14:24:17 -0800
Subject: [PATCH] Fix puppet subscription for elastic-recheck.

The installation of elastic-recheck is done on multiple machines but the
irc bot is only run on one machine. Therefore don't notify the bot
service from the install exec instead subscribe to the exec from the
service.

Change-Id: I11f3d32e40408a02d948d0533f5a4c45c983adae
---
 manifests/bot.pp  | 5 ++++-
 manifests/init.pp | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/bot.pp b/manifests/bot.pp
index f26144f..3318bdb 100644
--- a/manifests/bot.pp
+++ b/manifests/bot.pp
@@ -73,7 +73,10 @@ class elastic_recheck::bot (
   service { 'elastic-recheck':
     ensure    => running,
     enable    => true,
-    subscribe => File['/etc/elastic-recheck/elastic-recheck.conf'],
+    subscribe => [
+      File['/etc/elastic-recheck/elastic-recheck.conf'],
+      Exec['::elastic_recheck::install_elastic-recheck'],
+    ],
     require   => [
       Class['elastic_recheck'],
       File['/etc/init.d/elastic-recheck'],
diff --git a/manifests/init.pp b/manifests/init.pp
index b532c30..d431bc2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,7 +41,6 @@ class elastic_recheck (
     command     => 'pip install /opt/elastic-recheck',
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
-    notify      => Service['elastic-recheck'],
     subscribe   => Vcsrepo['/opt/elastic-recheck'],
     require     => Class['pip'],
   }