aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--overcloud-resource-registry-puppet.yaml1
-rw-r--r--puppet/controller-puppet.yaml2
2 files changed, 2 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index db556e80..8e26266b 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -74,3 +74,4 @@ parameter_defaults:
GlanceRegistryNetwork: internal_api
KeystoneAdminApiNetwork: internal_api
KeystonePublicApiNetwork: external
+ NeutronApiNetwork: internal_api
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}