diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-25 09:53:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-25 09:53:09 +0000 |
| commit | f86d9d7cb4ebbfc038b89a49094cf37817893a41 (patch) | |
| tree | 32b9f7dc939ab4bcde3c42e7ba40e5408ec61fc2 | |
| parent | 3c083d5956812c8517c4a6f7e340940f1710d86f (diff) | |
| parent | 2ce8aa08e5337f2643d5e8bc3a1d8ccdc3662652 (diff) | |
Merge "Include zaqar apache module"
| -rw-r--r-- | manifests/profile/base/zaqar.pp | 7 | ||||
| -rw-r--r-- | releasenotes/notes/zaqar-httpd-93db7feb60622687.yaml | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp index 7fbcd34..243dcc7 100644 --- a/manifests/profile/base/zaqar.pp +++ b/manifests/profile/base/zaqar.pp @@ -54,8 +54,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. |