From b24f2636a1e90c43607babd3a907583eaa15ef47 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Mon, 8 Jun 2015 15:00:07 +0200
Subject: [PATCH] Add libuuid devel packages

python-qpid-proton does something similar to pyzmq when libzmq is not
installed. It bundles the underlying library and builds it.
Unfortunately, python-qpid-proton currently has a dependency on
`libuuid` and therefore, it depends on the devel packages to be present.

This dependency will be removed in the future but it'll take time. Until
that happens, I'm adding uuid-dev to the list of packages to install by
default.

Change-Id: Iae4d7138311eec0cd90c0865f30b84a98ce3c142
---
 modules/openstack_project/manifests/jenkins_params.pp | 4 ++++
 modules/openstack_project/manifests/thick_slave.pp    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index 26306ddcb9..7e0a73be5c 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -90,6 +90,8 @@ class openstack_project::jenkins_params {
         $cgred_require = Package['cgroups']
         $dvipng_package = 'dvipng'
       }
+
+      $uuid_dev = "uuid-devel"
     }
     'Debian': {
       # packages needed by slaves
@@ -166,6 +168,8 @@ class openstack_project::jenkins_params {
         Package['cgroups'],
         File['/etc/init/cgred.conf'],
       ]
+
+      $uuid_dev = "uuid-dev"
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")
diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp
index 3ee90e6b47..3705c83307 100644
--- a/modules/openstack_project/manifests/thick_slave.pp
+++ b/modules/openstack_project/manifests/thick_slave.pp
@@ -50,6 +50,8 @@ class openstack_project::thick_slave(
     $::openstack_project::jenkins_params::xslt_package, # for building openstack docs
     $::openstack_project::jenkins_params::xvfb_package, # for selenium tests
     $::openstack_project::jenkins_params::php5_cli_package, # for community portal build
+
+    $::openstack_project::jenkins_params::uuid_dev, # for oslo.messaging pyngus/proton
   ]
 
   package { $packages: