diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-24 18:21:28 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-24 18:21:28 +0000 |
commit | 28af14ae41e95824beb1ab3fa6ccd163b4e2fd75 (patch) | |
tree | f5c292472e2046cb37eee6a81ed885f0036f52e3 /manifests/profile/base | |
parent | 88560a7dc3565e9e4a5655bf8abb70d0606c3cff (diff) | |
parent | 732d87864429445a9010963bc456a67e422b2d8f (diff) |
Merge "Enable mistral to run under mod_wsgi"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r-- | manifests/profile/base/mistral/api.pp | 56 |
1 files changed, 52 insertions, 4 deletions
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index 50708f1..3e0eed7 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -18,6 +18,27 @@ # # === Parameters # +# [*certificates_specs*] +# (Optional) The specifications to give to certmonger for the certificate(s) +# it will create. +# Example with hiera: +# apache_certificates_specs: +# httpd-internal_api: +# hostname: <overcloud controller fqdn> +# service_certificate: <service certificate path> +# service_key: <service key path> +# principal: "haproxy/<overcloud controller fqdn>" +# Defaults to hiera('apache_certificate_specs', {}). +# +# [*enable_internal_tls*] +# (Optional) Whether TLS in the internal network is enabled or not. +# Defaults to hiera('enable_internal_tls', false) +# +# [*mistral_api_network*] +# (Optional) The network name where the mistral API endpoint is listening on. +# This is set by t-h-t. +# Defaults to hiera('mistral_api_network', undef) +# # [*bootstrap_node*] # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') @@ -28,8 +49,11 @@ # Defaults to hiera('step') # class tripleo::profile::base::mistral::api ( - $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $certificates_specs = hiera('apache_certificates_specs', {}), + $enable_internal_tls = hiera('enable_internal_tls', false), + $mistral_api_network = hiera('mistral_api_network', undef), + $step = hiera('step'), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -39,8 +63,32 @@ class tripleo::profile::base::mistral::api ( include ::tripleo::profile::base::mistral - if $step >= 4 or ($step >= 3 and $sync_db) { - include ::mistral::api + if $enable_internal_tls { + if !$mistral_api_network { + fail('mistral_api_network is not set in the hieradata.') + } + $tls_certfile = $certificates_specs["httpd-${mistral_api_network}"]['service_certificate'] + $tls_keyfile = $certificates_specs["httpd-${mistral_api_network}"]['service_key'] + } else { + $tls_certfile = undef + $tls_keyfile = undef + } + + if $step >= 3 { + # TODO: Cleanup when this passes t-h-t + class { '::mistral::api': + service_name => 'httpd', + } + + include ::apache::mod::ssl + class { '::mistral::wsgi::apache': + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, + # The following are temporary and will be passed via t-h-t + ssl => $enable_internal_tls, + servername => hiera("fqdn_${mistral_api_network}"), + bind_host => hiera('mistral::api::bind_host'), + } } } |