openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Map Heat services to isolated networks"

This commit is contained in:
Jenkins 2015-05-27 20:01:40 +00:00 committed by Gerrit Code Review
parent 5812cbd29a 41f0b76907
commit 4c27451263
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

@ -795,9 +795,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}