aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r--puppet/compute.yaml10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 199eeeab..c33373d1 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -290,6 +290,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:
@@ -614,9 +621,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