From 5331c0a5a2635e9c5c0474b0227545488a1398e7 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Fri, 1 Apr 2016 09:56:09 -0700
Subject: [PATCH] Make git protocol point to git.o.o

Openstack supports the git protocol (git://git.openstack.org/)
for accessing our repros[1].  The anoymous git download command
on the Gerrit change screen points to review.o.o We prefer it
to point to the cgit servers because  those are faster and
there are many more of them.

[1] https://git.openstack.org/cgit/openstack-infra/system-config

Change-Id: I7989769b3e702c9f924b76e862e775d5717fb529
Depends-on: I5bd57d91b4d4a685328efe4d589a191debaa0fe5
---
 modules/openstack_project/manifests/gerrit.pp | 2 ++
 modules/openstack_project/manifests/review.pp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 75af9bf12d..dc00e079f1 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -9,6 +9,7 @@ class openstack_project::gerrit (
   $vhost_name = $::fqdn,
   $canonicalweburl = "https://${::fqdn}/",
   $git_http_url = '',
+  $canonical_git_url = '',
   $serveradmin = 'webmaster@openstack.org',
   $ssh_host_key = '/home/gerrit2/review_site/etc/ssh_host_rsa_key',
   $ssh_project_key = '/home/gerrit2/review_site/etc/ssh_project_rsa_key',
@@ -106,6 +107,7 @@ class openstack_project::gerrit (
     vhost_name                          => $vhost_name,
     canonicalweburl                     => $canonicalweburl,
     git_http_url                        => $git_http_url,
+    canonical_git_url                   => $canonical_git_url,
     # opinions
     allow_drafts                        => false,
     enable_melody                       => true,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index e60c33f655..8eb5e9ae84 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -93,6 +93,7 @@ class openstack_project::review (
 
   class { 'openstack_project::gerrit':
     git_http_url                        => 'https://git.openstack.org/',
+    canonical_git_url                   => 'git://git.openstack.org/',
     ssl_cert_file                       => $ssl_cert_file,
     ssl_key_file                        => $ssl_key_file,
     ssl_chain_file                      => $ssl_chain_file,