openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Map Neutron services to isolated networks"

This commit is contained in:
Jenkins 2015-05-27 20:01:33 +00:00 committed by Gerrit Code Review
parent 593e3dc530 80b3098338
commit 5812cbd29a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,3 +74,4 @@ parameter_defaults:
GlanceRegistryNetwork: internal_api
KeystoneAdminApiNetwork: internal_api
KeystonePublicApiNetwork: external
NeutronApiNetwork: internal_api

2
puppet/controller-puppet.yaml
View File

@ -825,7 +825,7 @@ resources:
mysql_cluster_name: {get_input: mysql_cluster_name}
# Neutron
neutron::bind_host: {get_input: controller_host}
neutron::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
neutron::rabbit_password: {get_input: rabbit_password}
neutron::rabbit_user: {get_input: rabbit_user}
neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}