aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad P. Crochet <brad@redhat.com>2017-04-26 13:46:17 -0400
committerBrad P. Crochet <brad@redhat.com>2017-05-06 19:14:47 -0400
commit5f0f850d78f9bf7393fe77313aedaf1d32da8b40 (patch)
treeda24b44ccec3fd754655d4e8384d13350f119707
parent732d87864429445a9010963bc456a67e422b2d8f (diff)
Pass mistral::api service_name from t-h-t
In order to have the chicken-egg work, service_name had to be explicitly passed to ::mistral::api. This switches to using values from t-h-t. Change-Id: Ib94e51f863ba59a1a1db47d58aed3ba4e5fc9650 Depends-On: Ie98dd5061d92dbc3c15bdd8926b0e3d62cc471f6
-rw-r--r--manifests/profile/base/mistral/api.pp14
1 files changed, 3 insertions, 11 deletions
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index 3e0eed7..4f81725 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -75,19 +75,11 @@ class tripleo::profile::base::mistral::api (
}
if $step >= 3 {
- # TODO: Cleanup when this passes t-h-t
- class { '::mistral::api':
- service_name => 'httpd',
- }
-
+ include ::mistral::api
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'),
+ ssl_cert => $tls_certfile,
+ ssl_key => $tls_keyfile,
}
}
}