diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-03-03 10:40:04 +0200 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-03-07 15:04:43 +0000 |
| commit | a2f3b91fa666824f78395c11bbfac04afc5129a0 (patch) | |
| tree | 89f05716d240c509d82ddf88568328f16f5ca16c | |
| parent | d82a7c50c25fd760786b76ef0593c75477496189 (diff) | |
httpd: Clean up heat API profiles and add release note
There were some values that were passed to the classes manually, and
this takes the parameters from t-h-t instead. Also, the release note was
added.
bp tls-via-certmonger
Change-Id: I17c4b7041e16da6489f4b713fdeb28a6e1c5563c
Depends-On: I88e5ea7b9bbf35ae03f84fdc3ec76ae09f11a1b6
| -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 | ||||
| -rw-r--r-- | releasenotes/notes/deploy-heat-APIs-over-httpd-46b111d0a4a4eed4.yaml | 3 |
4 files changed, 12 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, } } } diff --git a/releasenotes/notes/deploy-heat-APIs-over-httpd-46b111d0a4a4eed4.yaml b/releasenotes/notes/deploy-heat-APIs-over-httpd-46b111d0a4a4eed4.yaml new file mode 100644 index 0000000..a50a27d --- /dev/null +++ b/releasenotes/notes/deploy-heat-APIs-over-httpd-46b111d0a4a4eed4.yaml @@ -0,0 +1,3 @@ +--- +features: + - Heat APIs (api, cfn and cloudwatch) are now deployed over httpd. |