openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix ssl on glance

Browse Source 
Change-Id: I18763a5c4b323b1dc52ede0130d2a818dc5bbf0c
This commit is contained in:
ZhongShengping 2018-03-21 09:38:43 +08:00
parent 801ca7a47c
commit eed0c743ec
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/glance.pp
View File

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