openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Sahara: Always use httpd+mod_wsgi to deploy API in Ubuntu"

Browse Source
This commit is contained in:
Zuul 2023-03-23 17:38:10 +00:00 committed by Gerrit Code Review
commit ba0d9c098f
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/sahara.pp
View File

@ -52,9 +52,6 @@ class openstack_integration::sahara (
} }
class { 'sahara': class { 'sahara':
host => $::openstack_integration::config::host, host => $::openstack_integration::config::host,
use_ssl => $::openstack_integration::config::ssl,
cert_file => $::openstack_integration::params::cert_path,
key_file => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto, 'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host, 'host' => $::openstack_integration::config::host,
@ -73,14 +70,9 @@ class openstack_integration::sahara (
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
$service_name = $facts['os']['name'] ? {
'Debian' => $::sahara::params::api_service_name,
default => 'httpd',
}
class { 'sahara::service::api': class { 'sahara::service::api':
service_name => $service_name, service_name => 'httpd',
} }
if $service_name == 'httpd' {
include apache include apache
class { 'sahara::wsgi::apache': class { 'sahara::wsgi::apache':
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,
@ -89,7 +81,6 @@ class openstack_integration::sahara (
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
workers => 2, workers => 2,
} }
}
class { 'sahara::service::engine': } class { 'sahara::service::engine': }
class { 'sahara::client': } class { 'sahara::client': }
class { 'sahara::notify': } class { 'sahara::notify': }