Merge "Add SSL support to App Catlog site"

This commit is contained in:
Jenkins 2015-10-03 15:10:50 +00:00 committed by Gerrit Code Review
commit 447cf6bf00

View File

@ -1001,10 +1001,16 @@ node 'translate-dev.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'apps.openstack.org' { node 'apps.openstack.org' {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80, 443],
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
} }
class { '::apps_site': class { '::apps_site':
ssl_cert_file => '/etc/ssl/certs/apps.openstack.org.pem',
ssl_cert_file_contents => hiera('apps_ssl_cert_file_contents', 'XXX'),
ssl_key_file => '/etc/ssl/private/apps.openstack.org.key',
ssl_key_file_contents => hiera('apps_ssl_key_file_contents', 'XXX'),
ssl_chain_file => '/etc/ssl/certs/apps.openstack.org_intermediate.pem',
ssl_chain_file_contents => hiera('apps_ssl_chain_file_contents', 'XXX'),
} }
} }