aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 20:01:33 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 20:01:33 +0000
commit5812cbd29af5247a5503e1963f14fe502f80088a (patch)
tree34800055ff070c91216e43962af4601cedb4ef4f /puppet
parent593e3dc530058a4a0fb6b03ed32e7792883a5590 (diff)
parent80b30983386466f08f11c285627c99f7d16d3448 (diff)
Merge "Map Neutron services to isolated networks"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 3437c291..7e931976 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -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}