From a590e41d90031b52859c6fef49c0e7f0d45bfa23 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Fri, 28 Jun 2013 14:46:33 +0000
Subject: [PATCH] Fix lodgeit puppet bugs.

Add a service dependency and subscribe lodgeit to drizzle refresh
events.

Change-Id: I4ed1d5255e8e46854133f00262904291ff5f1c41
Reviewed-on: https://review.openstack.org/34893
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 modules/lodgeit/manifests/init.pp | 1 +
 modules/lodgeit/manifests/site.pp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/lodgeit/manifests/init.pp b/modules/lodgeit/manifests/init.pp
index 4db53f0a00..9237945636 100644
--- a/modules/lodgeit/manifests/init.pp
+++ b/modules/lodgeit/manifests/init.pp
@@ -42,6 +42,7 @@ class lodgeit {
   service { 'drizzle':
     ensure     => running,
     hasrestart => true,
+    require    => Package['drizzle'],
   }
 
   vcsrepo { '/tmp/lodgeit-main':
diff --git a/modules/lodgeit/manifests/site.pp b/modules/lodgeit/manifests/site.pp
index 79e4465d1d..28c91b1fdd 100644
--- a/modules/lodgeit/manifests/site.pp
+++ b/modules/lodgeit/manifests/site.pp
@@ -75,8 +75,9 @@ define lodgeit::site(
   }
 
   service { "${name}-paste":
-    ensure   => running,
-    provider => upstart,
-    require  => [Service['drizzle', 'apache2'], Exec["create_database_${name}"]],
+    ensure    => running,
+    provider  => upstart,
+    require   => [Service['drizzle', 'apache2'], Exec["create_database_${name}"]],
+    subscribe => Service['drizzle'],
   }
 }