diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/heat/api.pp | 13 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cfn.pp | 12 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cloudwatch.pp | 12 |
3 files changed, 9 insertions, 28 deletions
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp index b68abad..9ffba9c 100644 --- a/manifests/profile/base/heat/api.pp +++ b/manifests/profile/base/heat/api.pp @@ -77,17 +77,10 @@ class tripleo::profile::base::heat::api ( } if $step >= 4 { - class { '::heat::api': - service_name => 'httpd', # TODO cleanup when this is passed by t-h-t. - } - + include ::heat::api class { '::heat::wsgi::apache_api': - 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_network}"), - bind_host => hiera('heat::api::bind_host'), + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, } } } 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, } } } diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp index 59535ce..4dd2607 100644 --- a/manifests/profile/base/heat/api_cloudwatch.pp +++ b/manifests/profile/base/heat/api_cloudwatch.pp @@ -77,17 +77,11 @@ class tripleo::profile::base::heat::api_cloudwatch ( } if $step >= 4 { - class { '::heat::api_cloudwatch': - service_name => 'httpd', # TODO cleanup when this is passed by t-h-t. - } + include ::heat::api_cloudwatch class { '::heat::wsgi::apache_api_cloudwatch': - 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_cloudwatch_network}"), - bind_host => hiera('heat::api_cloudwatch::bind_host'), + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, } } } |