opendev/system-config
Code Issues Proposed changes

Merge "Make git protocol point to git.o.o"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 20:49:51 +00:00 committed by Gerrit Code Review
commit 771e3f1456
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/gerrit.pp
View File

@ -9,6 +9,7 @@ class openstack_project::gerrit (
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$canonicalweburl = "https://${::fqdn}/", $canonicalweburl = "https://${::fqdn}/",
$git_http_url = '', $git_http_url = '',
$canonical_git_url = '',
$serveradmin = 'webmaster@openstack.org', $serveradmin = 'webmaster@openstack.org',
$ssh_host_key = '/home/gerrit2/review_site/etc/ssh_host_rsa_key', $ssh_host_key = '/home/gerrit2/review_site/etc/ssh_host_rsa_key',
$ssh_project_key = '/home/gerrit2/review_site/etc/ssh_project_rsa_key', $ssh_project_key = '/home/gerrit2/review_site/etc/ssh_project_rsa_key',
@ -109,6 +110,7 @@ class openstack_project::gerrit (
vhost_name => $vhost_name, vhost_name => $vhost_name,
canonicalweburl => $canonicalweburl, canonicalweburl => $canonicalweburl,
git_http_url => $git_http_url, git_http_url => $git_http_url,
canonical_git_url => $canonical_git_url,
# opinions # opinions
allow_drafts => false, allow_drafts => false,
enable_melody => true, enable_melody => true,

1
modules/openstack_project/manifests/review.pp
View File

@ -93,6 +93,7 @@ class openstack_project::review (
class { 'openstack_project::gerrit': class { 'openstack_project::gerrit':
git_http_url => 'https://git.openstack.org/', git_http_url => 'https://git.openstack.org/',
canonical_git_url => 'git://git.openstack.org/',
ssl_cert_file => $ssl_cert_file, ssl_cert_file => $ssl_cert_file,
ssl_key_file => $ssl_key_file, ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file, ssl_chain_file => $ssl_chain_file,