diff --git a/manifests/site.pp b/manifests/site.pp index dfe2629f63..d49ac55e63 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -499,6 +499,9 @@ node 'zuul.openstack.org' { swift_default_container => 'infra-files', swift_default_logserver_prefix => 'http://logs.openstack.org/', swift_default_expiry => 14400, + proxy_ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents', 'XXX'), + proxy_ssl_key_file_contents => hiera('zuul_ssl_key_file_contents', 'XXX'), + proxy_ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents', 'XXX'), zuul_url => 'http://zuul.openstack.org/p', sysadmins => hiera('sysadmins', []), statsd_host => 'graphite.openstack.org', diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index e9280b415a..34a6ce4eb1 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -19,6 +19,9 @@ class openstack_project::zuul_prod( $swift_default_container = '', $swift_default_logserver_prefix = '', $swift_default_expiry = 7200, + $proxy_ssl_cert_file_contents = '', + $proxy_ssl_key_file_contents = '', + $proxy_ssl_chain_file_contents = '', $sysadmins = [], $statsd_host = '', $gearman_workers = [], @@ -60,6 +63,9 @@ class openstack_project::zuul_prod( swift_default_container => $swift_default_container, swift_default_logserver_prefix => $swift_default_logserver_prefix, swift_default_expiry => $swift_default_expiry, + proxy_ssl_cert_file_contents => $proxy_ssl_cert_file_contents, + proxy_ssl_key_file_contents => $proxy_ssl_key_file_contents, + proxy_ssl_chain_file_contents => $proxy_ssl_chain_file_contents, } class { '::zuul::server':