summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-10 14:44:35 +0000
committerGerrit Code Review <review@openstack.org>2015-07-10 14:44:36 +0000
commitb7400f95a4c185c6c1b3294c11af828d799939d0 (patch)
treeca29943822d7b48988b509c88b3d1cb79afbc0de /puppet/controller-puppet.yaml
parent7614af59ce211b6afc31790489b4104067050522 (diff)
parent57573b77a9ce5a3a465318f4b60d8b8b24264ff1 (diff)
Merge "Add services to ServiceNetMap to select hostnames resolution network"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-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 eb3cd219..9f531efe 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -1109,7 +1109,7 @@ outputs:
str_replace:
template: IP HOST.localdomain HOST CLOUDNAME
params:
- IP: {get_attr: [Controller, networks, ctlplane, 0]}
+ IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]}
HOST: {get_attr: [Controller, name]}
CLOUDNAME: {get_param: CloudName}
nova_server_resource: