From 9b43153f9822a38b4f6e29febd14d894e91425b2 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Wed, 28 Oct 2015 16:43:51 +0200 Subject: Introduce domain configuration through parameter Introduce configuration of the nodes' domains through a parameter. Change-Id: Ie012f9f2a402b0333bebecb5b59565c26a654297 --- puppet/compute.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'puppet/compute.yaml') diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 1d16a254..daf6db42 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -278,6 +278,13 @@ parameters: description: > Heat action when to apply network configuration changes default: ['CREATE'] + CloudDomain: + default: '' + type: string + description: > + The DNS domain used for the hosts. This should match the dhcp_domain + configured in the Undercloud neutron. Defaults to localdomain. + resources: @@ -595,9 +602,10 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: "IP HOST.localdomain HOST" + template: "IP HOST.DOMAIN HOST" params: IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ComputeHostnameResolveNetwork]}]} + DOMAIN: {get_param: CloudDomain} HOST: {get_attr: [NovaCompute, name]} nova_server_resource: description: Heat resource handle for the Nova compute server -- cgit 1.2.3-korg