1 files changed, 13 insertions, 12 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index b5694802..c1a04e24 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -316,6 +316,7 @@ resources:
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - common
+          merge_behavior: deeper
           datafiles:
             common:
               raw_data: {get_file: hieradata/common.yaml}
@@ -379,12 +380,12 @@ outputs:
       str_replace:
         template: |
           PRIMARYIP PRIMARYHOST.DOMAIN PRIMARYHOST
-          EXTERNALIP EXTERNALHOST
-          INTERNAL_APIIP INTERNAL_APIHOST
-          STORAGEIP STORAGEHOST
-          STORAGE_MGMTIP STORAGE_MGMTHOST
-          TENANTIP TENANTHOST
-          MANAGEMENTIP MANAGEMENTHOST
+          EXTERNALIP EXTERNALHOST.DOMAIN EXTERNALHOST
+          INTERNAL_APIIP INTERNAL_APIHOST.DOMAIN INTERNAL_APIHOST
+          STORAGEIP STORAGEHOST.DOMAIN STORAGEHOST
+          STORAGE_MGMTIP STORAGE_MGMTHOST.DOMAIN STORAGE_MGMTHOST
+          TENANTIP TENANTHOST.DOMAIN TENANTHOST
+          MANAGEMENTIP MANAGEMENTHOST.DOMAIN MANAGEMENTHOST
         params:
           PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, BlockStorageHostnameResolveNetwork]}]}
           DOMAIN: {get_param: CloudDomain}
@@ -392,37 +393,37 @@ outputs:
           EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
           EXTERNALHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - external
           INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
           INTERNAL_APIHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - internalapi
           STORAGEIP: {get_attr: [StoragePort, ip_address]}
           STORAGEHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - storage
           STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
           STORAGE_MGMTHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - storagemgmt
           TENANTIP: {get_attr: [TenantPort, ip_address]}
           TENANTHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - tenant
           MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
           MANAGEMENTHOST:
             list_join:
-            - '-'
+            - '.'
             - - {get_attr: [BlockStorage, name]}
               - management
   nova_server_resource: