diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-03 09:06:03 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-03 09:06:03 +0000 |
commit | 0072701294a3ca7f26edeec0e09b72fd511b7764 (patch) | |
tree | 736e0142b9c071b90e1247a6b50ba10705b006d0 /puppet/controller.yaml | |
parent | c643d4bfccb51f234ed03e7d1d61025edd43622a (diff) | |
parent | 9b43153f9822a38b4f6e29febd14d894e91425b2 (diff) |
Merge "Introduce domain configuration through parameter"
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 388c06a2..244c91ef 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -628,6 +628,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: @@ -1407,9 +1413,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: |