From 8bb3f35a2bfc14038cc1800eb67f86b89d5be86a Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 9 Jun 2015 22:54:38 +0200 Subject: [PATCH] Add swig 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 `swig` to build the python module. I'm adding swig to the list of packages to install by default. Change-Id: I2bba0392fa2d35e8877d0c33b89c0245f625fcaf --- modules/openstack_project/manifests/jenkins_params.pp | 2 ++ modules/openstack_project/manifests/thick_slave.pp | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 7e0a73be5c..b6171d428e 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -92,6 +92,7 @@ class openstack_project::jenkins_params { } $uuid_dev = "uuid-devel" + $swig = "swig" } 'Debian': { # packages needed by slaves @@ -170,6 +171,7 @@ class openstack_project::jenkins_params { ] $uuid_dev = "uuid-dev" + $swig = "swig" } 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 3705c83307..b5a609d10b 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -52,6 +52,7 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::php5_cli_package, # for community portal build $::openstack_project::jenkins_params::uuid_dev, # for oslo.messaging pyngus/proton + $::openstack_project::jenkins_params::swig, # for oslo.messaging pyngus/proton ] package { $packages: