opendev/system-config
Code Issues Proposed changes

Merge "Use zuul.opendev.org LE cert"

Browse Source
This commit is contained in:
Zuul 2020-01-10 16:34:00 +00:00 committed by Gerrit Code Review
commit a04eb94d41
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -934,7 +934,7 @@ node /^zuul\d+\.open.*\.org$/ {
'zuul.opendev.org' => { 'zuul.opendev.org' => {
tenant_name => '', tenant_name => '',
ssl => true, ssl => true,
use_le => false, use_le => true,
}, },
'zuul.openstack.org-http' => { 'zuul.openstack.org-http' => {
tenant_name => 'openstack', tenant_name => 'openstack',
@ -953,11 +953,6 @@ node /^zuul\d+\.open.*\.org$/ {
ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'),
ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'), ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'),
}, },
'zuul.opendev.org' => {
ssl_cert_file_contents => hiera('opendev_zuul_ssl_cert_file_contents'),
ssl_chain_file_contents => hiera('opendev_zuul_ssl_chain_file_contents'),
ssl_key_file_contents => hiera('opendev_zuul_ssl_key_file_contents'),
},
}, },
} }