Map Neutron services to isolated networks
authorDan Sneddon <dsneddon@redhat.com>
Wed, 27 May 2015 01:46:13 +0000 (18:46 -0700)
committerDan Sneddon <dsneddon@redhat.com>
Wed, 27 May 2015 06:39:21 +0000 (23:39 -0700)
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

overcloud-resource-registry-puppet.yaml
puppet/controller-puppet.yaml

index db556e8..8e26266 100644 (file)
@@ -74,3 +74,4 @@ parameter_defaults:
     GlanceRegistryNetwork: internal_api
     KeystoneAdminApiNetwork: internal_api
     KeystonePublicApiNetwork: external
+    NeutronApiNetwork: internal_api
index ca65097..e9a7d48 100644 (file)
@@ -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}