From e73ff00c5bfe43e1462455d00d8b9a48fd909c3f Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 30 Jul 2014 23:12:03 +0000
Subject: [PATCH] Zuul depends indirectly on lxml

* modules/zuul/manifests/init.pp: When zuul started using
python-keystoneclient for Swift integration in 36c3fa5 it began
indirectly depending on lxml via keystoneclient. To pip install lxml
you need libxml and libxslt development packages on the system to
provide headers so that the library bindings can be compiled, so
it's easier to just use the python-lxml system packages instead.

Change-Id: Id83ad09f99bcb1606f4037fbb26823a9bd0401ee
---
 modules/zuul/manifests/init.pp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 3ac21874e7..f7bed1bdf6 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -52,9 +52,10 @@ class zuul (
 
   $packages = [
     'gcc',  # yappi requires this to build
-    'python-webob',
     'python-lockfile',
+    'python-lxml', # needed by python-keystoneclient, has system bindings
     'python-paste',
+    'python-webob',
   ]
 
   package { $packages:
@@ -118,7 +119,19 @@ class zuul (
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/zuul'],
-    require     => Class['pip'],
+    require     => [
+      Class['pip'],
+      Package['gcc'],
+      Package['python-daemon'],
+      Package['python-lockfile'],
+      Package['python-lxml'],
+      Package['python-paramiko'],
+      Package['python-paste'],
+      Package['python-webob'],
+      Package['python-yaml'],
+      Package['yappi'],
+      Package['yui-compressor'],
+    ],
   }
 
   file { '/etc/zuul':