From 6e67f14f56dd92715719974387708c9e786c95d1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sun, 20 May 2018 16:42:45 -0700 Subject: [PATCH] Pass airshipit cgit config through to git_backend.pp We need the ssl cert data passed through otherwise httpd refuses to start. Change-Id: Icc61860918059216da61f992e472531990e38219 --- manifests/site.pp | 3 +++ modules/openstack_project/manifests/git_backend.pp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index c202bfac88..9609198e3e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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' } diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp index dcc20d0c42..c76b226363 100644 --- a/modules/openstack_project/manifests/git_backend.pp +++ b/modules/openstack_project/manifests/git_backend.pp @@ -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',