openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Revert "Debian: Setup Cinder using cinder-api uwsgi" 

This reverts commit 1d884ac12d.
Indeed, using uwsgi doesn't work over SSL. After trying locally on
my machine, switching back to mod-wsgi-py3 fixes the problem.

Change-Id: I577ac720ef6f9a5487cfbc9f6376f2535d918520
This commit is contained in:
Thomas Goirand 2018-05-18 16:11:40 +02:00
parent 41f90b5a69
commit c10f011520
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/cinder.pp
View File

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