From c10f0115206b21371dee36cb0a8bb218b3f2cf92 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 18 May 2018 16:11:40 +0200
Subject: [PATCH] Revert "Debian: Setup Cinder using cinder-api uwsgi"

This reverts commit 1d884ac12d340c94c58aad004ca0cf76219df97f.
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
---
 manifests/cinder.pp | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 2d0e3af70..ec192e8b8 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -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': }