opendev/puppet-infracloud
Code Issues Proposed changes

Merge "Fix certificate path naming and races"

Browse Source
This commit is contained in:
Jenkins 2016-07-08 10:20:26 +00:00 committed by Gerrit Code Review
commit 1c0e61b929
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute.pp
View File

@ -11,7 +11,7 @@ class infracloud::compute(
$openstack_release = 'mitaka',
) {
$ssl_cert_path = '/etc/ssl/certs/openstack_infra_ca.pem'
$ssl_cert_path = '/usr/local/share/ca-certificates/openstack_infra_ca.crt'
### Certificate Chain ###

3
manifests/controller.pp
View File

@ -26,7 +26,7 @@ class infracloud::controller(
$keystone_auth_uri = "https://${controller_public_address}:5000"
$keystone_admin_uri = "https://${controller_public_address}:35357"
$ssl_cert_path = '/etc/ssl/certs/openstack_infra_ca.pem'
$ssl_cert_path = '/usr/local/share/ca-certificates/openstack_infra_ca.crt'
### Certificate Chain ###
@ -109,6 +109,7 @@ class infracloud::controller(
ssl_cacert => $ssl_cert_path,
ssl_cert => $ssl_cert_path,
ssl_key => "/etc/rabbitmq/ssl/private/${controller_public_address}.pem",
require => File[$ssl_cert_path],
}
### Keystone ###