openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Trove: Use httpd+mod_wsgi to run trove-api"

Browse Source
This commit is contained in:
Zuul
2023-02-24 13:19:02 +00:00
committed by Gerrit Code Review
parent 6d40ecf2a4 7115e28f92
commit 17d72d4262
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/trove.pp
View File

@@ -10,15 +10,10 @@ class openstack_integration::trove {
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'trove': openstack_integration::ssl_key { 'trove':
notify => Service['httpd'],
require => Package['trove'], require => Package['trove'],
} }
$key_file = "/etc/trove/ssl/private/${::fqdn}.pem" Exec['update-ca-certificates'] ~> Service['httpd']
$crt_file = $::openstack_integration::params::cert_path
File[$key_file] ~> Service<| tag == 'trove-service' |>
Exec['update-ca-certificates'] ~> Service<| tag == 'trove-service' |>
} else {
$key_file = undef
$crt_file = undef
} }
class { 'trove::logging': class { 'trove::logging':
@@ -68,11 +63,17 @@ class openstack_integration::trove {
password => 'a_big_secret', password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri, auth_url => $::openstack_integration::config::keystone_auth_uri,
} }
class { 'trove::api': include apache
class { 'trove::wsgi::apache':
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/trove/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path,
workers => 2, workers => 2,
cert_file => $crt_file, }
key_file => $key_file, class { 'trove::api':
bind_host => $::openstack_integration::config::host,
service_name => 'httpd',
} }
class { 'trove::client': } class { 'trove::client': }
class { 'trove::conductor': class { 'trove::conductor':