From 2ce8aa08e5337f2643d5e8bc3a1d8ccdc3662652 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Tue, 21 Mar 2017 09:51:26 +0100
Subject: [PATCH] Include zaqar apache module

This includes the Zaqar apache module, allowing to run Zaqar behind
httpd.

Depends-On: I69b923dd76a60e9ec786cae886c137ba572ec906
Change-Id: Ib52144e5877d9293057713d6bdca557724baad5c
---
 manifests/profile/base/zaqar.pp                      | 7 +++++--
 releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml

diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index 89a03ad00..cd2ac60cc 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -53,8 +53,11 @@ class tripleo::profile::base::zaqar (
     include ::zaqar::transport::wsgi
 
     # TODO (bcrochet): At some point, the transports should be split out to
-    # seperate services.
-    include ::zaqar::server
+    # separate services.
+    class { '::zaqar::server':
+      service_name => 'httpd', # TODO cleanup when passed by t-h-t.
+    }
+    include ::zaqar::wsgi::apache
     zaqar::server_instance{ '1':
       transport => 'websocket'
     }
diff --git a/releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml b/releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml
new file mode 100644
index 000000000..cff9d65e6
--- /dev/null
+++ b/releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Run the Zaqar WSGI service over httpd.