From 93ab8feca646ddd1036408a88ee1ea124704e119 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 4 Mar 2016 13:39:44 -0500
Subject: [PATCH] Move curl to jenkins_common.pp

After switching to ubuntu-trusty and project that use
other-requirements.txt for bindep, log uploads will fail.  So rather
then forcing all projects to include curl in other-requirements.txt,
we'll install it with puppet.

Our entry point is ::openstack_project::single_use_slave.

Change-Id: Icade064bd32c2179836f4d1c3d2ec91425422d02
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/jenkins_params.pp | 2 --
 modules/openstack_project/manifests/slave_common.pp   | 7 +++++++
 modules/openstack_project/manifests/thick_slave.pp    | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index c2858433f1..37ec772358 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -10,7 +10,6 @@ class openstack_project::jenkins_params {
       $ant_package = 'ant'
       $awk_package = 'gawk'
       $asciidoc_package = 'asciidoc'
-      $curl_package = 'curl'
       $docbook_xml_package = 'docbook-style-xsl'
       $docbook5_xml_package = 'docbook5-schemas'
       $docbook5_xsl_package = 'docbook5-style-xsl'
@@ -102,7 +101,6 @@ class openstack_project::jenkins_params {
       $ant_package = 'ant'
       $awk_package = 'gawk'
       $asciidoc_package = 'asciidoc'
-      $curl_package = 'curl'
       $docbook_xml_package = 'docbook-xml'
       $docbook5_xml_package = 'docbook5-xml'
       $docbook5_xsl_package = 'docbook-xsl'
diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp
index 45678c3084..433b38888d 100644
--- a/modules/openstack_project/manifests/slave_common.pp
+++ b/modules/openstack_project/manifests/slave_common.pp
@@ -90,6 +90,13 @@ class openstack_project::slave_common(
     }
   }
 
+  # needed by jenkins/jobs
+  if ! defined(Package['curl']) {
+    package { 'curl':
+      ensure => present,
+    }
+  }
+
   # install linux-headers depending on OS version
   case $::osfamily {
     'RedHat': {
diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp
index 5edd111e7b..3f0a99d3b6 100644
--- a/modules/openstack_project/manifests/thick_slave.pp
+++ b/modules/openstack_project/manifests/thick_slave.pp
@@ -11,7 +11,6 @@ class openstack_project::thick_slave(
     $::openstack_project::jenkins_params::ant_package, # for building buck
     $::openstack_project::jenkins_params::awk_package, # for building extract_docs.awk to work correctly
     $::openstack_project::jenkins_params::asciidoc_package, # for building gerrit/building openstack docs
-    $::openstack_project::jenkins_params::curl_package,
     $::openstack_project::jenkins_params::docbook_xml_package, # for building openstack docs
     $::openstack_project::jenkins_params::docbook5_xml_package, # for building openstack docs
     $::openstack_project::jenkins_params::docbook5_xsl_package, # for building openstack docs