openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Fix glance beaker error"

Browse Source
This commit is contained in:
Zuul 2018-03-27 06:47:36 +00:00 committed by Gerrit Code Review
commit 9474d6c42c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/glance.pp
View File

@ -14,10 +14,15 @@ class openstack_integration::glance (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'glance':
notify => Service['glance-api'],
notify => Service['glance-api'],
}
Package<| tag == 'glance-package' |> -> File['/etc/glance/ssl']
$key_file = "/etc/glance/ssl/private/${::fqdn}.pem"
$crt_file = $::openstack_integration::params::cert_path
Exec['update-ca-certificates'] ~> Service['glance-api']
} else {
$key_file = undef
$crt_file = undef
}
openstack_integration::mq_user { 'glance':
@ -81,8 +86,8 @@ class openstack_integration::glance (
stores => $glance_stores,
default_store => $backend,
bind_host => $::openstack_integration::config::host,
cert_file => $::openstack_integration::params::cert_path,
key_file => "/etc/glance/ssl/private/${::fqdn}.pem",
cert_file => $crt_file,
key_file => $key_file,
enable_v1_api => false,
enable_v2_api => true,
}