openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Map Heat services to isolated networks 

This change adds parameters to specify which networks the Heat services
will use. If the internal_api network exists, the Heat API, Heat Cloud
Formations, and Heat Cloudwatch services will bind to the IP address on
that network, otherwise the services will default to the IP on the
Undercloud 'ctlplane' network.

Change-Id: I5febe1b9071600b43fa76c6cf415db83cad472ab
This commit is contained in:
Dan Sneddon 2015-05-26 18:49:24 -07:00
parent 80b3098338
commit 41f0b76907
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overcloud-resource-registry-puppet.yaml
View File

@ -75,3 +75,6 @@ parameter_defaults:
KeystoneAdminApiNetwork: internal_api
KeystonePublicApiNetwork: external
NeutronApiNetwork: internal_api
HeatApiNetwork: internal_api
HeatApiCfnNetwork: internal_api
HeatApiCloudwatchNetwork: internal_api

6
puppet/controller-puppet.yaml
View File

@ -783,9 +783,9 @@ resources:
heat::auth_uri: {get_input: keystone_auth_uri}
heat::identity_uri: {get_input: keystone_identity_uri}
heat::keystone_password: {get_input: heat_password}
heat::api::bind_host: {get_input: controller_host}
heat::api_cloudwatch::bind_host: {get_input: controller_host}
heat::api_cfn::bind_host: {get_input: controller_host}
heat::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
heat::api_cloudwatch::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCloudwatchNetwork]}]}
heat::api_cfn::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCfnNetwork]}]}
heat::database_connection: {get_input: heat_dsn}
heat::instance_user: heat-admin
heat::debug: {get_input: debug}