aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-10-19 16:29:03 +0200
committerMichele Baldessari <michele@acksyn.org>2017-10-24 17:57:24 +0200
commit93a9217ab51718e4081c5c87ddcadff84804aa49 (patch)
tree0626cd10e9b3db242dee0341b1ccd60acdca79f1 /manifests/profile/base
parentd335965eb848cfde5cc06136b5b2fcc6b436a419 (diff)
Add option to disable running mistral-api via wsgi
The tripleo container do not yet have the required packages to run mistral-api on top of apache so we're looking for a way to disable it. Change-Id: I54627f1c5a8867738a55bee42075bb6087830c61 Related-Bug: #1724607 (cherry picked from commit 5eb571c4053f40d74aa5e6d136ab10c08094ddb9)
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/mistral/api.pp17
1 files changed, 13 insertions, 4 deletions
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index b5ca85e..2ab2d96 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -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,
+ }
}
}
}