Configurable [clients]/endpoint_type for heat.conf
Makes the [clients]/endpoint_type in heat.conf configurable instead of hardcoded to internal. The hieradata_override configuration could be used to set the hiera value. This ought to be configurable in the case where using deployed servers and the ctlplane is not routable from the deployed servers network(s). In that situation, you would have to use the undercloud's public endpoints (with an ssl hostname set via undercloud_public_host) for Heat polling and signaling. Depends-On: If707c5623c0e34e9219eeafdafaf0ac42daf5c8d Closes-Bug: #1674822 Co-Authorized-By: James Slagle <jslagle@redhat.com> Co-Authorized-By: Emilien Macchi <emilien@redhat.com> Change-Id: I8102392ddceda0a55be6767cbbda572ac2fda0b9
This commit is contained in:
parent
9f23fbda47
commit
2f0c6e8e24
|
@ -448,9 +448,7 @@ class { '::heat':
|
||||||
debug => hiera('debug'),
|
debug => hiera('debug'),
|
||||||
keystone_ec2_uri => join([hiera('keystone_auth_uri'), '/ec2tokens']),
|
keystone_ec2_uri => join([hiera('keystone_auth_uri'), '/ec2tokens']),
|
||||||
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
|
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
|
||||||
}
|
heat_clients_endpoint_type => hiera('heat_clients_endpoint_type', 'internal'),
|
||||||
heat_config {
|
|
||||||
'clients/endpoint_type': value => 'internal',
|
|
||||||
}
|
}
|
||||||
include ::heat::api
|
include ::heat::api
|
||||||
include ::heat::wsgi::apache_api
|
include ::heat::wsgi::apache_api
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
In /etc/heat/heat.conf, [clients]/endpoint_type was configured to use the
|
||||||
|
internal endpoints and this was hardcoded in puppet-stack-config.pp so
|
||||||
|
there was no way to change it. It's now configurable via the hiera key
|
||||||
|
heat_clients_endpoint_type.
|
Loading…
Reference in New Issue