1 files changed, 62 insertions, 32 deletions
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 34f10a21..c9bf894f 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -239,39 +239,69 @@ resources:
   BlockStorageConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          hierarchy:
-            - '"%{::uuid}"'
-            - heat_config_%{::deploy_config_name}
-            - volume_extraconfig
-            - extraconfig
-            - service_names
-            - service_configs
-            - volume
-            - bootstrap_node # provided by allNodesConfig
-            - all_nodes # provided by allNodesConfig
-            - vip_data # provided by allNodesConfig
-            - '"%{::osfamily}"'
-          merge_behavior: deeper
-          datafiles:
-            service_names:
-              mapped_data:
-                service_names: {get_param: ServiceNames}
-                sensu::subscriptions: {get_param: MonitoringSubscriptions}
-            service_configs:
-              mapped_data:
-                map_replace:
-                  - {get_param: ServiceConfigSettings}
-                  - values: {get_attr: [NetIpMap, net_ip_map]}
-            volume_extraconfig:
-              mapped_data: {get_param: BlockStorageExtraConfig}
-            extraconfig:
-              mapped_data: {get_param: ExtraConfig}
-            volume:
-              mapped_data:
-                tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
+        hierarchy:
+          - '"%{::uuid}"'
+          - heat_config_%{::deploy_config_name}
+          - volume_extraconfig
+          - extraconfig
+          - service_names
+          - service_configs
+          - volume
+          - bootstrap_node # provided by allNodesConfig
+          - all_nodes # provided by allNodesConfig
+          - vip_data # provided by allNodesConfig
+          - '"%{::osfamily}"'
+        merge_behavior: deeper
+        datafiles:
+          service_names:
+            service_names: {get_param: ServiceNames}
+            sensu::subscriptions: {get_param: MonitoringSubscriptions}
+          service_configs:
+            map_replace:
+              - {get_param: ServiceConfigSettings}
+              - values: {get_attr: [NetIpMap, net_ip_map]}
+          volume_extraconfig: {get_param: BlockStorageExtraConfig}
+          extraconfig: {get_param: ExtraConfig}
+          volume:
+            tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
+            fqdn_internal_api:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - internalapi
+                - {get_param: CloudDomain}
+            fqdn_storage:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - storage
+                - {get_param: CloudDomain}
+            fqdn_storage_mgmt:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - storagemgmt
+                - {get_param: CloudDomain}
+            fqdn_tenant:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - tenant
+                - {get_param: CloudDomain}
+            fqdn_management:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - management
+                - {get_param: CloudDomain}
+            fqdn_ctlplane:
+              list_join:
+              - '.'
+              - - {get_attr: [BlockStorage, name]}
+                - ctlplane
+                - {get_param: CloudDomain}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData: