Merge "Add global_config_settings to services' output"

1 files changed, 41 insertions, 5 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index f2c4b631..97bfe015 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -453,7 +453,15 @@ resources:
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           NodeIndex: '%index%'
-          ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
+          ServiceConfigSettings:
+            map_merge:
+              - get_attr: [ControllerServiceChain, role_data, config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+              - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+              - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
           ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
           MonitoringSubscriptions: {get_attr: [ControllerServiceChain, role_data, monitoring_subscriptions]}
 
@@ -485,7 +493,14 @@ resources:
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           NodeIndex: '%index%'
-          ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
+          ServiceConfigSettings:
+            map_merge:
+              - get_attr: [ComputeServiceChain, role_data, config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+              - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+              - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
           ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
           MonitoringSubscriptions: {get_attr: [ComputeServiceChain, role_data, monitoring_subscriptions]}
 
@@ -518,7 +533,14 @@ resources:
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'
-          ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
+          ServiceConfigSettings:
+            map_merge:
+              - get_attr: [BlockStorageServiceChain, role_data, config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+              - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+              - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
           ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
           MonitoringSubscriptions: {get_attr: [BlockStorageServiceChain, role_data, monitoring_subscriptions]}
 
@@ -551,7 +573,14 @@ resources:
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'
-          ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
+          ServiceConfigSettings:
+            map_merge:
+              - get_attr: [ObjectStorageServiceChain, role_data, config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+              - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+              - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
           ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
           MonitoringSubscriptions: {get_attr: [ObjectStorageServiceChain, role_data, monitoring_subscriptions]}
 
@@ -584,7 +613,14 @@ resources:
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'
-          ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
+          ServiceConfigSettings:
+            map_merge:
+              - get_attr: [CephStorageServiceChain, role_data, config_settings]
+              - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+              - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+              - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+              - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
           ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
           MonitoringSubscriptions: {get_attr: [CephStorageServiceChain, role_data, monitoring_subscriptions]}