openstack/puppet-openstack-integration
Code Issues Proposed changes

Debian: Setup Cinder using cinder-api uwsgi

Browse Source 
In Debian, cinder-api is using uwsgi. Use that instead of Apache.

Change-Id: I07054c0a5fb32335d3e4895fb79ce783830ca97b
This commit is contained in:
Thomas Goirand
2018-04-18 10:51:46 +02:00
parent a45fae3c03
commit 1d884ac12d
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/cinder.pp
View File

@@ -99,21 +99,28 @@ class openstack_integration::cinder (
auth_uri => $::openstack_integration::config::keystone_auth_uri, auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
if ($::os_package_type == 'debian') {
$service_name = 'cinder-api'
} else {
$service_name = 'httpd'
}
class { '::cinder::api': class { '::cinder::api':
default_volume_type => 'BACKEND_1', default_volume_type => 'BACKEND_1',
public_endpoint => "${::openstack_integration::config::base_url}:8776", public_endpoint => "${::openstack_integration::config::base_url}:8776",
service_name => 'httpd', service_name => $service_name,
keymgr_backend => $keymgr_backend, keymgr_backend => $keymgr_backend,
keymgr_encryption_api_url => $keymgr_encryption_api_url, keymgr_encryption_api_url => $keymgr_encryption_api_url,
keymgr_encryption_auth_url => $keymgr_encryption_auth_url, keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
} }
include ::apache if ($::os_package_type != 'debian') {
class { '::cinder::wsgi::apache': include ::apache
bind_host => $::openstack_integration::config::ip_for_url, class { '::cinder::wsgi::apache':
ssl => $::openstack_integration::config::ssl, bind_host => $::openstack_integration::config::ip_for_url,
ssl_key => "/etc/cinder/ssl/private/${::fqdn}.pem", ssl => $::openstack_integration::config::ssl,
ssl_cert => $::openstack_integration::params::cert_path, ssl_key => "/etc/cinder/ssl/private/${::fqdn}.pem",
workers => 2, ssl_cert => $::openstack_integration::params::cert_path,
workers => 2,
}
} }
class { '::cinder::quota': } class { '::cinder::quota': }
class { '::cinder::scheduler': } class { '::cinder::scheduler': }