From d0404e17cb1b6e0376c44c4c09bf3232de5f1385 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 12 Oct 2012 14:48:56 -0700
Subject: [PATCH] Add python-yaml to github module.

Change-Id: Id79068e1295cbc7ba01a2c9b8db7db40230a2296
Reviewed-on: https://review.openstack.org/14412
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 manifests/init.pp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 24b0554..419c79f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,6 +12,14 @@ class github (
     require => Class[pip]
   }
 
+  # A lot of things need yaml, be conservative requiring this package to avoid
+  # conflicts with other modules.
+  if ! defined(Package['python-yaml']) {
+    package { 'python-yaml':
+      ensure => present,
+    }
+  }
+
   group { "github":
     ensure => present
   }
@@ -68,7 +76,10 @@ class github (
     user => github,
     minute => "*/5",
     command => 'sleep $((RANDOM\%60+90)) && python /usr/local/github/scripts/close_pull_requests.py',
-    require => File['/usr/local/github/scripts'],
+    require => [
+                 File['/usr/local/github/scripts'],
+                 Package['python-yaml'],
+                 Package['PyGithub'],
+               ],
   }
-
 }