opendev/system-config
Code Issues Proposed changes

Pass airshipit cgit config through to git_backend.pp

Browse Source 
We need the ssl cert data passed through otherwise httpd refuses to
start.

Change-Id: Icc61860918059216da61f992e472531990e38219
This commit is contained in:
Clark Boylan 2018-05-20 16:42:45 -07:00
parent 73f3932919
commit 6e67f14f56
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -639,6 +639,9 @@ node /^git\d+\.openstack\.org$/ {
git_zuul_ci_org_ssl_cert_file_contents => hiera('git_zuul_ci_org_ssl_cert_file_contents'),
git_zuul_ci_org_ssl_key_file_contents => hiera('git_zuul_ci_org_ssl_key_file_contents'),
git_zuul_ci_org_ssl_chain_file_contents => hiera('git_zuul_ci_org_ssl_chain_file_contents'),
git_airshipit_org_ssl_cert_file_contents => hiera('git_airshipit_org_ssl_cert_file_contents'),
git_airshipit_org_ssl_key_file_contents => hiera('git_airshipit_org_ssl_key_file_contents'),
git_airshipit_org_ssl_chain_file_contents => hiera('git_airshipit_org_ssl_chain_file_contents'),
behind_proxy => true,
selinux_mode => 'enforcing'
}

3
modules/openstack_project/manifests/git_backend.pp
View File

@ -24,6 +24,9 @@ class openstack_project::git_backend (
$git_zuul_ci_org_ssl_cert_file_contents = '',
$git_zuul_ci_org_ssl_key_file_contents = '',
$git_zuul_ci_org_ssl_chain_file_contents = '',
$git_airshipit_org_ssl_cert_file_contents = '',
$git_airshipit_org_ssl_key_file_contents = '',
$git_airshipit_org_ssl_chain_file_contents = '',
$behind_proxy = false,
$project_config_repo = '',
$selinux_mode = 'enforcing',