diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2015-10-28 16:43:51 +0200 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2015-12-02 10:39:47 +0200 |
commit | 9b43153f9822a38b4f6e29febd14d894e91425b2 (patch) | |
tree | 5a991226728765443f2c4557b2c391a9b3b95c1d /puppet/compute.yaml | |
parent | a3a6b30d1093113db6b909f833570e1574e8b454 (diff) |
Introduce domain configuration through parameter
Introduce configuration of the nodes' domains through a parameter.
Change-Id: Ie012f9f2a402b0333bebecb5b59565c26a654297
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 10 |
1 files changed, 9 insertions, 1 deletions
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 |