aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Herve <therve@redhat.com>2017-03-21 09:51:26 +0100
committerThomas Herve <therve@redhat.com>2017-04-20 12:19:59 +0200
commit2ce8aa08e5337f2643d5e8bc3a1d8ccdc3662652 (patch)
tree90869b5ca1179c6dd77bf081cdb076fd98e52fa4
parent02f5102eeb2600068c7561b156bf00a8eeed5bd0 (diff)
Include zaqar apache module
This includes the Zaqar apache module, allowing to run Zaqar behind httpd. Depends-On: I69b923dd76a60e9ec786cae886c137ba572ec906 Change-Id: Ib52144e5877d9293057713d6bdca557724baad5c
-rw-r--r--manifests/profile/base/zaqar.pp7
-rw-r--r--releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml3
2 files changed, 8 insertions, 2 deletions
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index 89a03ad..cd2ac60 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 0000000..cff9d65
--- /dev/null
+++ b/releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml
@@ -0,0 +1,3 @@
+---
+features:
+ - Run the Zaqar WSGI service over httpd.