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
This commit is contained in:
parent
d82a7c50c2
commit
a2f3b91fa6
@ -77,17 +77,10 @@ class tripleo::profile::base::heat::api (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $step >= 4 {
|
if $step >= 4 {
|
||||||
class { '::heat::api':
|
include ::heat::api
|
||||||
service_name => 'httpd', # TODO cleanup when this is passed by t-h-t.
|
|
||||||
}
|
|
||||||
|
|
||||||
class { '::heat::wsgi::apache_api':
|
class { '::heat::wsgi::apache_api':
|
||||||
ssl_cert => $tls_certfile,
|
ssl_cert => $tls_certfile,
|
||||||
ssl_key => $tls_keyfile,
|
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'),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,17 +77,11 @@ class tripleo::profile::base::heat::api_cfn (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $step >= 4 {
|
if $step >= 4 {
|
||||||
class { '::heat::api_cfn':
|
include ::heat::api_cfn
|
||||||
service_name => 'httpd', # TODO cleanup when this is passed by t-h-t.
|
|
||||||
}
|
|
||||||
|
|
||||||
class { '::heat::wsgi::apache_api_cfn':
|
class { '::heat::wsgi::apache_api_cfn':
|
||||||
ssl_cert => $tls_certfile,
|
ssl_cert => $tls_certfile,
|
||||||
ssl_key => $tls_keyfile,
|
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'),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,17 +77,11 @@ class tripleo::profile::base::heat::api_cloudwatch (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $step >= 4 {
|
if $step >= 4 {
|
||||||
class { '::heat::api_cloudwatch':
|
include ::heat::api_cloudwatch
|
||||||
service_name => 'httpd', # TODO cleanup when this is passed by t-h-t.
|
|
||||||
}
|
|
||||||
|
|
||||||
class { '::heat::wsgi::apache_api_cloudwatch':
|
class { '::heat::wsgi::apache_api_cloudwatch':
|
||||||
ssl_cert => $tls_certfile,
|
ssl_cert => $tls_certfile,
|
||||||
ssl_key => $tls_keyfile,
|
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'),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Heat APIs (api, cfn and cloudwatch) are now deployed over httpd.
|
Loading…
Reference in New Issue
Block a user