From db226cca8978a10e9d8020a7d00121412a01ebe6 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 14 Jul 2015 10:20:18 -0700
Subject: [PATCH] Add ianw's centos6 git repo to all centos6 machines

We suspect that the centos6 git slowness is affecting git client
operations on our servers themselves (invoked via puppet vcsrepo).
This installs ianw's fixed version of git on all centos6 machines.

Change-Id: I8496e9fd8d07829fb341b9241ea20d3f49d455b4
---
 modules/openstack_project/files/git-1237395.repo |  8 ++++++++
 modules/openstack_project/manifests/template.pp  | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 modules/openstack_project/files/git-1237395.repo

diff --git a/modules/openstack_project/files/git-1237395.repo b/modules/openstack_project/files/git-1237395.repo
new file mode 100644
index 0000000000..f7aaf1d824
--- /dev/null
+++ b/modules/openstack_project/files/git-1237395.repo
@@ -0,0 +1,8 @@
+[iwienand-git-1237395]
+name=Copr repo for git-1237395 owned by iwienand
+baseurl=https://copr-be.cloud.fedoraproject.org/results/iwienand/git-1237395/epel-6-$basearch/
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/iwienand/git-1237395/pubkey.gpg
+enabled=1
+enabled_metadata=1
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index b1fc3de11a..e2003ac55b 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -352,6 +352,19 @@ class openstack_project::template (
       source  => 'puppet:///modules/openstack_project/centos-puppetlabs.repo',
       replace => true,
     }
+
+    # This git package includes a small work-around for slow https
+    # cloning performance, as discussed in redhat bz#1237395.  Should
+    # be fixed in 6.8
+    file { '/etc/yum.repos.d/git-1237395.repo':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/git-1237395.repo',
+      replace => true,
+    }
+
     file { '/etc/yum.conf':
       ensure  => present,
       owner   => 'root',