From e125dd465ae0603385c26ad14fa267f2e213d67e Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 18 Apr 2018 09:25:57 +0200
Subject: [PATCH] Debian uses uwsgi for nova-placement-api

Do not attempt to configure apache for nova-placement-api in the
case of Debian, as everything is handled by the package that uses
uwsgi instead of apache.

Needed-By: I081542bfca7f5d4f3c0d8493c0b7c90d782a3e1f
Change-Id: I2808e73576fc90c6c9d5c0c1c020998a521924f2
---
 manifests/nova.pp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifests/nova.pp b/manifests/nova.pp
index 218472df1..f8f8e7d8e 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -133,13 +133,15 @@ class openstack_integration::nova (
     ssl       => $::openstack_integration::config::ssl,
     workers   => '2',
   }
-  class { '::nova::wsgi::apache_placement':
-    bind_host => $::openstack_integration::config::ip_for_url,
-    api_port  => '8778',
-    ssl_key   => "/etc/nova/ssl/private/${::fqdn}.pem",
-    ssl_cert  => $::openstack_integration::params::cert_path,
-    ssl       => $::openstack_integration::config::ssl,
-    workers   => '2',
+  if ($::os_package_type != 'debian') {
+    class { '::nova::wsgi::apache_placement':
+      bind_host => $::openstack_integration::config::ip_for_url,
+      api_port  => '8778',
+      ssl_key   => "/etc/nova/ssl/private/${::fqdn}.pem",
+      ssl_cert  => $::openstack_integration::params::cert_path,
+      ssl       => $::openstack_integration::config::ssl,
+      workers   => '2',
+    }
   }
   class { '::nova::placement':
     auth_url => $::openstack_integration::config::keystone_admin_uri,