From 91994702833e728279e1b54e072837f641ec74f9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 22 Aug 2011 01:41:58 -0400
Subject: [PATCH] Run reprepro on debuild.

Change-Id: Ib92dc0316d2fac0814680f015abb65fe67cca8fc
Reviewed-on: https://review.openstack.org/305
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 manifests/site.pp                             |  2 ++
 modules/apt_server/manifests/init.pp          | 23 ++----------
 .../files/distributions                       |  0
 modules/reprepro/manifests/init.pp            | 36 +++++++++++++++++++
 4 files changed, 40 insertions(+), 21 deletions(-)
 rename modules/{apt_server => reprepro}/files/distributions (100%)
 create mode 100644 modules/reprepro/manifests/init.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 5c2c3cf65a..fe0c2f8e9b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -392,6 +392,8 @@ node /^driver(\d+)\.1918\.openstack\.org$/ {
 node /^debuild(-\d+)?\.slave\.openstack\.org$/ {
   include openstack_jenkins_slave
   include cowbuilder
+
+  class { "reprepro": }
 }
 
 node /^packages\.openstack\.org$/ {
diff --git a/modules/apt_server/manifests/init.pp b/modules/apt_server/manifests/init.pp
index ca001ad904..311abea398 100644
--- a/modules/apt_server/manifests/init.pp
+++ b/modules/apt_server/manifests/init.pp
@@ -1,9 +1,6 @@
 class apt_server {
 
-  $packages = ["reprepro",
-               "nginx"]
-
-  package { $packages: ensure => "latest" }
+  package { "nginx": ensure => "latest" }
 
   file { "/etc/nginx/sites-available/default":
     owner => 'root',
@@ -29,27 +26,11 @@ class apt_server {
   }
 
   file {"/srv/packages":
-    owner => 'root',
-    group => 'root',
-    mode => 755,
-    ensure => directory,
-    require => File["/srv"],
-  }
-
-  file {"/srv/packages/conf":
     owner => 'jenkins',
     group => 'jenkins',
     mode => 755,
     ensure => directory,
-    require => [File["/srv/packages"], User[jenkins]]
-  }
-
-  file {"/srv/packages/conf/distributions":
-    owner => 'root',
-    group => 'root',
-    mode => 444,
-    ensure => 'present',
-    source => "puppet:///modules/apt_server/distributions",
+    require => File["/srv"],
   }
 
   service { 'nginx':
diff --git a/modules/apt_server/files/distributions b/modules/reprepro/files/distributions
similarity index 100%
rename from modules/apt_server/files/distributions
rename to modules/reprepro/files/distributions
diff --git a/modules/reprepro/manifests/init.pp b/modules/reprepro/manifests/init.pp
new file mode 100644
index 0000000000..f699c94f99
--- /dev/null
+++ b/modules/reprepro/manifests/init.pp
@@ -0,0 +1,36 @@
+class reprepro {
+
+  package { "reprepro": ensure => "latest" }
+
+  file { "/srv":
+    owner => 'root',
+    group => 'root',
+    mode => 555,
+    ensure => directory,
+  }
+
+  file {"/srv/packages":
+    owner => 'jenkins',
+    group => 'jenkins',
+    mode => 755,
+    ensure => directory,
+    require => [File["/srv"], User[jenkins]]
+  }
+
+  file {"/srv/packages/conf":
+    owner => 'root',
+    group => 'root',
+    mode => 555,
+    ensure => directory,
+    require => File["/srv/packages"],
+  }
+
+  file {"/srv/packages/conf/distributions":
+    owner => 'root',
+    group => 'root',
+    mode => 444,
+    ensure => 'present',
+    source => "puppet:///modules/apt_server/distributions",
+  }
+
+}