openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix glance beaker error

Browse Source 
See glance beaker error[1].

[1]http://logs.openstack.org/25/556725/1/check/puppet-openstack-beaker-centos-7/6bd1bc6/logs/syslog.txt.gz#_Mar_27_02_52_07

This reverts commit eed0c743ec4c091a385eee404935484d8dbb347a.

Change-Id: I86ac3518d01cbf1ce1e8e1be05c6197ddf5bb72f
This commit is contained in:
zhongshengping 2018-03-27 04:28:42 +00:00
parent eed0c743ec
commit c2673d63a8
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,
}