From 174dc1392186a21a2b00d6b4005385950338e833 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 2 Aug 2011 14:26:49 -0700
Subject: [PATCH] Removed duplicate packages. Changed manifest in cron job.

Change-Id: Id88b9cfb4a165feb71cb6e5d8aac1d4867fc9560
---
 modules/jenkins_slave/manifests/init.pp | 26 +------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 428594bdc0..1450e064e1 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -16,7 +16,7 @@ class jenkins_slave {
     cron { "updatepuppet":
       user => root,
       minute => "*/15",
-      command => "cd /root/openstack-ci-puppet && /usr/bin/git pull && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/this.pp",
+      command => "cd /root/openstack-ci-puppet && /usr/bin/git pull && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
       require => [ Jenkinsuser[jenkins] ]
     }
 
@@ -48,10 +48,6 @@ class jenkins_slave {
        ],
     }
 
-    package { "python-software-properties":
-        ensure => latest
-          }
-
     package { "openjdk-6-jre":
         ensure => latest
           }
@@ -60,22 +56,6 @@ class jenkins_slave {
         ensure => latest
           }
     
-    package { "puppet":
-        ensure => latest
-          }
-    
-    package { "bzr":
-        ensure => latest
-          }
-    
-    package { "git":
-        ensure => latest
-          }
-    
-    package { "python-setuptools":
-        ensure => latest
-          }
-    
     package { "python-sphinx":
         ensure => latest
           }
@@ -92,10 +72,6 @@ class jenkins_slave {
         ensure => latest
           }
     
-    package { "byobu":
-        ensure => latest
-          }
-
     package { "python-dev":
          ensure => latest
            }