From 5edaf90e60720e325fd0fac547246414544a6433 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 1 Jul 2014 10:27:36 -0700
Subject: [PATCH] Put the mirror config into slave_common

slave.pp is skipped for single-use slaves. Put the base mirror config
into slave_common so that it'll get picked up.

Change-Id: I4bff37ecab78264207e83eb237798ed320dfdab7
---
 modules/openstack_project/manifests/slave.pp  | 23 -------------------
 .../manifests/slave_common.pp                 | 18 +++++++++++++++
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 9bf3a7e204..6365f9b6d8 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -27,29 +27,6 @@ class openstack_project::slave (
     python3      => $python3,
   }
 
-  file { '/home/jenkins/.pydistutils.cfg':
-    ensure  => present,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    mode    => '0644',
-    source  => 'puppet:///modules/openstack_project/pydistutils.cfg',
-    require => Class['jenkins::slave'],
-  }
-
-  file { '/home/jenkins/.pip':
-    ensure  => directory,
-    require => Class['jenkins::slave'],
-  }
-
-  file { '/home/jenkins/.pip/pip.conf':
-    ensure  => present,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    mode    => '0644',
-    source  => 'puppet:///modules/openstack_project/pip.conf',
-    require => File['/home/jenkins/.pip'],
-  }
-
   class { 'salt':
     salt_master => 'ci-puppetmaster.openstack.org',
   }
diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp
index 626f9fe37a..88f37bbb68 100644
--- a/modules/openstack_project/manifests/slave_common.pp
+++ b/modules/openstack_project/manifests/slave_common.pp
@@ -25,6 +25,24 @@ class openstack_project::slave_common(
     source  => 'puppet:///modules/openstack_project/slave_scripts',
   }
 
+  file { '/home/jenkins/.pydistutils.cfg':
+    ensure  => present,
+    owner   => 'jenkins',
+    group   => 'jenkins',
+    mode    => '0644',
+    source  => 'puppet:///modules/openstack_project/pydistutils.cfg',
+    require => Class['jenkins::slave'],
+  }
+
+  file { '/home/jenkins/.pip/pip.conf':
+    ensure  => present,
+    owner   => 'jenkins',
+    group   => 'jenkins',
+    mode    => '0644',
+    source  => 'puppet:///modules/openstack_project/pip.conf',
+    require => Class['jenkins::slave'],
+  }
+
   if ($sudo == true) {
     file { '/etc/sudoers.d/jenkins-sudo':
       ensure => present,