diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-11 02:58:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-11 02:58:19 +0000 |
| commit | 9aa3841a3cf73fa9dd185a543d7e53a7e6ebce08 (patch) | |
| tree | 339b2e0f1e3dd7997269ff648d5623ffa0add3cb /manifests/profile/base/heat/api_cfn.pp | |
| parent | 64b419f4a47646b98586bcb9751564e82585274b (diff) | |
| parent | a2f3b91fa666824f78395c11bbfac04afc5129a0 (diff) | |
Merge "httpd: Clean up heat API profiles and add release note"
Diffstat (limited to 'manifests/profile/base/heat/api_cfn.pp')
| -rw-r--r-- | manifests/profile/base/heat/api_cfn.pp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp index c7ff5d1..987d3b2 100644 --- a/manifests/profile/base/heat/api_cfn.pp +++ b/manifests/profile/base/heat/api_cfn.pp @@ -77,17 +77,11 @@ class tripleo::profile::base::heat::api_cfn ( } if $step >= 4 { - class { '::heat::api_cfn': - service_name => 'httpd', # TODO cleanup when this is passed by t-h-t. - } + include ::heat::api_cfn class { '::heat::wsgi::apache_api_cfn': - ssl_cert => $tls_certfile, - ssl_key => $tls_keyfile, - # TODO: The following are temporary and will be passed via t-h-t - ssl => $enable_internal_tls, - servername => hiera("fqdn_${heat_api_cfn_network}"), - bind_host => hiera('heat::api_cfn::bind_host'), + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, } } } |