From 1c7c567f5ac92429bc976854ccbab41504ebb2be Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 4 Aug 2012 15:02:23 -0500
Subject: [PATCH] Install git from git-core ppa for oneiric.

Fixes 1034130.

Oneiric git is very slow with precise due to a version mismatch madness.

Change-Id: I2eb54848cd671e091879dd2f6a57f32a2ac6405b
Reviewed-on: https://review.openstack.org/10843
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/openstack_project/manifests/base.pp | 25 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index 1ca0c1223e..d6ced969ff 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -10,17 +10,30 @@ class openstack_project::base($install_users=true) {
     ensure => purged
   }
 
+  if ( $lsbdistcodename == "oneiric" ) {
+    include apt
+    apt::ppa { 'ppa:git-core/ppa': }
+    package { "git":
+      ensure => latest,
+      require => Apt::Ppa['ppa:git-core/ppa']
+    }
+  } else {
+    package { "git":
+      ensure => present,
+    }
+  }
+
   $packages = ["puppet",
-               "git",
                "python-setuptools",
-               "python-virtualenv",
-               "python-software-properties",
-               "bzr",
-               "byobu",
-               "emacs23-nox"]
+               "python-virtualenv"]
   package { $packages: ensure => "present" }
 
   if ($install_users) {
+
+      package { ["byobu", "emacs23-nox"]:
+          ensure => "present"
+      }
+
       realize (
         User::Virtual::Localuser["mordred"],
         User::Virtual::Localuser["corvus"],