openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix ssl on zaqar

Browse Source 
Change-Id: I02eab735494b6bcabc1e15dcc97e886e05018fab
This commit is contained in:
ZhongShengping
2018-03-23 11:36:42 +08:00
parent 22c51717e5
commit 7a5419cf30
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/zaqar.pp
View File

@@ -7,14 +7,8 @@ class openstack_integration::zaqar {
notify => Service['httpd'], notify => Service['httpd'],
require => Package['zaqar-common'], require => Package['zaqar-common'],
} }
$key_file = "/etc/zaqar/ssl/private/${::fqdn}.pem"
$crt_file = $::openstack_integration::params::cert_path
Exec['update-ca-certificates'] ~> Service['httpd'] Exec['update-ca-certificates'] ~> Service['httpd']
} else {
$key_file = undef
$crt_file = undef
} }
class {'::zaqar::logging': class {'::zaqar::logging':
debug => true, debug => true,
} }
@@ -58,8 +52,8 @@ class openstack_integration::zaqar {
class { '::zaqar::wsgi::apache': class { '::zaqar::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::ip_for_url,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_cert => $crt_file, ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => $key_file, ssl_key => "/etc/zaqar/ssl/private/${::fqdn}.pem",
workers => 2, workers => 2,
} }
include ::zaqar::db::sync include ::zaqar::db::sync