summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-05-26 18:46:13 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-05-26 23:39:21 -0700
commit80b30983386466f08f11c285627c99f7d16d3448 (patch)
treef81b2ec9f1963b2b591bc454ca85dd3e351325a2 /puppet
parent8072ae85082dd060d1cb8e3bcba76da8372ed593 (diff)
Map Neutron services to isolated networks
This change adds parameters to specify which network the Neutron API should use. If the internal_api network exists, Neutron will bind to the IP on that network, otherwise the Undercloud 'ctlplane' network will be used. The network that the Neutron API is bound to can be overridden in an environment file. Change-Id: I11bcebba3a22e8850095250a2ddfaf972339476b
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 ca650979..e9a7d488 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -813,7 +813,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}