From 57573b77a9ce5a3a465318f4b60d8b8b24264ff1 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 3 Jul 2015 10:53:53 +0200 Subject: Add services to ServiceNetMap to select hostnames resolution network The *HostnameResolveNetwork services define the network against which the hostnames in /etc/hosts should be resolved, defaults to 'internal_api' for all except CephStorage for which it uses 'storage' as they do not have connectivity to 'internal_api'. Closes-Bug: 1471179 Change-Id: Ia8971f8a63016966236e7975ac2d97921a314255 --- puppet/controller-puppet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/controller-puppet.yaml') diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 5a356bcc..591d0c29 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -1089,7 +1089,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: -- cgit 1.2.3-korg