summaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/swift-storage.yaml')
-rw-r--r--puppet/swift-storage.yaml10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index b1746dcb..fbb2b878 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -82,6 +82,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:
@@ -249,9 +256,10 @@ outputs:
hosts_entry:
value:
str_replace:
- template: "IP HOST.localdomain HOST"
+ template: "IP HOST.DOMAIN HOST"
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}
+ DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [SwiftStorage, name]}
nova_server_resource:
description: Heat resource handle for the swift storage server