openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Add option to disable running mistral-api via wsgi"

This commit is contained in:
Zuul 2017-10-24 09:26:09 +00:00 committed by Gerrit Code Review
parent fe22a5329c 5eb571c405
commit 9b3ff05900
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/profile/base/mistral/api.pp
View File

@ -39,6 +39,10 @@
# This is set by t-h-t.
# Defaults to hiera('mistral_api_network', undef)
#
# [*mistral_api_wsgi_enabled*]
# (Optional) Whether or not deploy Mistral API in WSGI with Apache.
# Defaults to hiera('mistral_wsgi_enabled', true)
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
@ -53,6 +57,7 @@ class tripleo::profile::base::mistral::api (
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$mistral_api_network = hiera('mistral_api_network', undef),
$mistral_api_wsgi_enabled = hiera('mistral_wsgi_enabled', true),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
@ -76,10 +81,14 @@ class tripleo::profile::base::mistral::api (
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
include ::mistral::api
include ::apache::mod::ssl
class { '::mistral::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
# Temporarily disable Mistral API deployed in WSGI
# https://bugs.launchpad.net/tripleo/+bug/1724607
if $mistral_api_wsgi_enabled {
include ::apache::mod::ssl
class { '::mistral::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
}
}
}