aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-26 14:48:19 +0000
committerGerrit Code Review <review@openstack.org>2017-05-26 14:48:19 +0000
commit019efc9378f5b928c80dae11dc7e74ab6171e009 (patch)
treec9403bfbbe79ac16dfa68159c03f291d5f4f4aa4
parent066dc2cecf5a30d4a0cf541b32a2ae45ae5de30a (diff)
parent5f0f850d78f9bf7393fe77313aedaf1d32da8b40 (diff)
Merge "Pass mistral::api service_name from t-h-t"
-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,
}
}
}