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/controller.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/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 861b29a8..34090ff0 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -612,6 +612,12 @@ parameters: NodeIndex: type: number default: 0 + 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: @@ -1382,9 +1388,10 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: IP HOST.localdomain HOST CLOUDNAME + template: IP HOST.DOMAIN HOST CLOUDNAME params: IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]} + DOMAIN: {get_param: CloudDomain} HOST: {get_attr: [Controller, name]} CLOUDNAME: {get_param: CloudName} nova_server_resource: |